about summary refs log tree commit diff
path: root/docs/Running-Mastodon/Heroku-guide.md
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-04-04 14:51:42 +0200
committerGitHub <noreply@github.com>2017-04-04 14:51:42 +0200
commit48dfdad49255ae4a100e01f41852e65806858fce (patch)
treea2bfe7a94bcd7a37399470b31c0453e1b489dea9 /docs/Running-Mastodon/Heroku-guide.md
parent5b6f4fdeb4932df1704da01762cc22c63aacb20f (diff)
parented4a723a82e90fc057494e4fdec4a2074a3164c7 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'docs/Running-Mastodon/Heroku-guide.md')
-rw-r--r--docs/Running-Mastodon/Heroku-guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/Running-Mastodon/Heroku-guide.md b/docs/Running-Mastodon/Heroku-guide.md
index 799b8a64c..b66e56200 100644
--- a/docs/Running-Mastodon/Heroku-guide.md
+++ b/docs/Running-Mastodon/Heroku-guide.md
@@ -8,6 +8,6 @@ Mastodon can theoretically run indefinitely on a free [Heroku](https://heroku.co
 1. Click the above button.
 2. Fill in the options requested.
   * You can use a .herokuapp.com domain, which will be simple to set up, or you can use a custom domain. If you want a custom domain and HTTPS, you will need to upgrade to a paid plan (to use Heroku's SSL features), or set up [CloudFlare](https://cloudflare.com) who offer free "Flexible SSL" (note: CloudFlare have some undefined limits on WebSockets. So far, no one has reported hitting concurrent connection limits).
-  * You will want Amazon S3 for file storage. The only exception is for development purposes, where you may not care if files are not saaved. Follow a guide online for creating a free Amazon S3 bucket and Access Key, then enter the details.
+  * You will want Amazon S3 for file storage. The only exception is for development purposes, where you may not care if files are not saved. Follow a guide online for creating a free Amazon S3 bucket and Access Key, then enter the details.
   * If you want your Mastodon to be able to send emails, configure SMTP settings here (or later). Consider using [Mailgun](https://mailgun.com) or similar, who offer free plans that should suit your interests.
 3. Deploy! The app should be set up, with a working web interface and database. You can change settings and manage versions from the Heroku dashboard.