merge documentation changes

This commit is contained in:
Devin Howard 2015-11-23 09:54:36 +08:00
commit 94412b21d2
2 changed files with 10 additions and 11 deletions

View file

@ -45,7 +45,8 @@ OR create a new account at `/join`, and use access code `qwertyui`
Start mapping and programming!
While we are still figuring out vagrant for Windows, there is an older set of instructions below
We haven't figured out Vagrant for Windows yet, but we have a set of manual instructions here:
- [For Windows][windows-installation]
## Contributing

View file

@ -1,17 +1,16 @@
Before you begin, you'll need to install a number of software packages:
Before you begin, you'll need to install stuff:
Ruby: http://rubyinstaller.org/downloads
Git: http://git-scm.com/download/win
PostgreSQL 9.2: http://www.enterprisedb.com/products-services-training/pgdownload
nodejs: http://nodejs.org/download
Ruby, Git, and Rails: http://railsinstaller.org/en
PostgreSQL 9.2: http://www.enterprisedb.com/products-services-training/pgdownload
nodejs: http://nodejs.org/download
During the installation of the PostgreSQL database, you'll need to choose a database password. Anything is fine, just note what you choose somewhere.
During the installation of the PostgreSQL database, you'll need to choose a database password. Anything is fine, just note down what you choose.
Once you are ready, create a new folder to hold this and any other git repositories. As an example, let's pretend you've chose C:\git, and made that folder writable by your user account.
Open a command prompt ("cmd.exe"), and navigate to the folder you chose. Then use the gem command (which is part of Ruby) to install Ruby on Rails.
cd \git
cd .\git
gem install rails -v 4.2
Now you are ready to clone the Metamaps git repository:
@ -40,9 +39,8 @@ Navigate your browser to localhost:3000 once you have the server running
Sign in with the default account
email: user@user.com
password: toolsplusconsciousness
email: user@user.com
password: toolsplusconsciousness
OR create a new account at /join, and use access code 'qwertyui'