about summary refs log tree commit diff
path: root/docs/Running-Mastodon/Vagrant-guide.md
diff options
context:
space:
mode:
authorEugen <eugen@zeonfederated.com>2017-01-26 23:03:41 +0100
committerGitHub <noreply@github.com>2017-01-26 23:03:41 +0100
commit87667e371c094e93cd66ce7f6dce05a44899cafd (patch)
treee5a5c0eb02ae91e56c183b684188e7302d546c1c /docs/Running-Mastodon/Vagrant-guide.md
parentf7aef16668230e13995812a80c67b6717b29404b (diff)
parentae2147d40f60fd627dbcfbc6c7f5b2081ed3a518 (diff)
Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
Add default account details to developer documentation.
Diffstat (limited to 'docs/Running-Mastodon/Vagrant-guide.md')
-rw-r--r--docs/Running-Mastodon/Vagrant-guide.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/Running-Mastodon/Vagrant-guide.md b/docs/Running-Mastodon/Vagrant-guide.md
index a94478392..b24f14e83 100644
--- a/docs/Running-Mastodon/Vagrant-guide.md
+++ b/docs/Running-Mastodon/Vagrant-guide.md
@@ -28,7 +28,7 @@ Running `vagrant up` for the first time will run provisioning, which will:
 
 The Vagrant box will automatically start after provisioning. It can be started in future with `vagrant up` from the mastodon directory.
 
-Once the Ubuntu virtual machine has booted, it will run the startup script, which loads the environment variables from `.env.vagrant` and then runs `rails s -d -b 0.0.0.0`. This will start a Rails server. You can then access your development site at http://mastodon.dev (or at http://localhost:3000 if you haven't installed vagrants-hostupdater).
+Once the Ubuntu virtual machine has booted, it will run the startup script, which loads the environment variables from `.env.vagrant` and then runs `rails s -d -b 0.0.0.0`. This will start a Rails server. You can then access your development site at http://mastodon.dev (or at http://localhost:3000 if you haven't installed vagrants-hostupdater). By default, your development environment will have an admin account created for you to use - the email address will be `admin@mastodon.dev` and the password will be `mastodonadmin`.
 
 To stop the server, simply run `vagrant halt`.