diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-05-06 12:23:26 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-05-06 12:23:26 +0100 |
| commit | dd7dca8e84646811d2f1a5d4bc6aa58432b532d8 (patch) | |
| tree | 0fe0e406e81c90e8a2063088edd358dce2e755a5 | |
| parent | 0e67b23bb8e3717c3817ada63fa3e677a7efe024 (diff) | |
| parent | 2a77c8fca7e19cf8148802865e6525304b07e3d3 (diff) | |
Merge branch 'vagrantfile-docs' into rails-3-develop
| -rw-r--r-- | Vagrantfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Vagrantfile b/Vagrantfile index dcdf1f433..5d56914a5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -25,7 +25,7 @@ # at http://10.10.10.30:3000 # # # Guest -# bundle exec rails s +# bundle exec rails server # # Customizing the Vagrant instance # ================================ @@ -37,10 +37,10 @@ # exporting to the environment. # # # Prefixing the command -# $ ALAVETELI_MEMORY=2048 vagrant up +# $ ALAVETELI_VAGRANT_MEMORY=2048 vagrant up # # # Exporting to the environment -# $ export ALAVETELI_MEMORY=2048 +# $ export ALAVETELI_VAGRANT_MEMORY=2048 # $ vagrant up # # Both have the same effect, but exporting will retain the variable for the |