Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3885 from devopsgroup-io/master 

Digital Ocean should be DigitalOcean https://www.digitalocean.com/leg…
This commit is contained in:
Robin Ward 2015-10-30 14:05:39 -04:00
parent bde4bc52d7 85da9c6ff8
commit 2f58663dda
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/INSTALL-cloud.md
View File

@ -1,8 +1,8 @@
**Set up Discourse in the cloud in under 30 minutes** with zero knowledge of Rails or Linux shell using our [Discourse Docker image][dd]. We recommend [Digital Ocean][do], but these steps will work on any Docker-compatible cloud provider or local server. **Set up Discourse in the cloud in under 30 minutes** with zero knowledge of Rails or Linux shell using our [Discourse Docker image][dd]. We recommend [DigitalOcean][do], but these steps will work on any Docker-compatible cloud provider or local server.
# Create New Cloud Server # Create New Cloud Server
[Sign up for Digital Ocean][do], update billing info, then create your new cloud server. [Sign up for DigitalOcean][do], update billing info, then create your new cloud server.
- Enter your domain `discourse.example.com` as the name. - Enter your domain `discourse.example.com` as the name.
@ -22,7 +22,7 @@ Connect to your server via SSH, or use [Putty][put] on Windows:
Replace `192.168.1.1` with the IP address of your server. Replace `192.168.1.1` with the IP address of your server.
You will be asked for permission to connect, type `yes`, then enter the root password from the email Digital Ocean sent you when the server was set up. You may be prompted to change the root password, too. You will be asked for permission to connect, type `yes`, then enter the root password from the email DigitalOcean sent you when the server was set up. You may be prompted to change the root password, too.
<img src="https://www.discourse.org/images/install/14/console-ssh.png?v=1" width="600px"> <img src="https://www.discourse.org/images/install/14/console-ssh.png?v=1" width="600px">

2
spec/fixtures/emails/html_only.eml vendored
View File

@ -80,7 +80,7 @@ king"</div></div></td></tr></tbody></table><div id=3D"_persistentHeaderEnd"=
und-color: rgb(255, 255, 255);"></div><br><div id=3D"_originalContent" styl= und-color: rgb(255, 255, 255);"></div><br><div id=3D"_originalContent" styl=
e=3D""><p>Grizzly B just sent you a private message</p> e=3D""><p>Grizzly B just sent you a private message</p>
<hr><p>Log in to our EC2 instance -or- log into a new Digital Ocean instanc= <hr><p>Log in to our EC2 instance -or- log into a new DigitalOcean instanc=
e?</p> e?</p>
<hr><p>Please visit this link to respond: <a href=3D"http://meta.discourse.= <hr><p>Please visit this link to respond: <a href=3D"http://meta.discourse.=

4
test/javascripts/fixtures/search-fixtures.js.es6
View File

@ -505,8 +505,8 @@ export default {
}, },
{ {
"id":26192, "id":26192,
"title":"403 when embedding a Digital Ocean droplet", "title":"403 when embedding a DigitalOcean droplet",
"fancy_title":"403 when embedding a Digital Ocean droplet", "fancy_title":"403 when embedding a DigitalOcean droplet",
"slug":"403-when-embedding-a-digital-ocean-droplet", "slug":"403-when-embedding-a-digital-ocean-droplet",
"posts_count":7, "posts_count":7,
"reply_count":3, "reply_count":3,

2
test/javascripts/fixtures/top_fixture.js.es6
View File

File diff suppressed because one or more lines are too long

2
test/javascripts/fixtures/user_fixtures.js.es6
View File

File diff suppressed because one or more lines are too long