Merge pull request #1 from timparenti/typos

Fix a few typos.
dlareau · Aug 25, 2015 · a96c7ce · a96c7ce
2 parents 4d43156 + 31fdccf
commit a96c7ce
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/basics.rst b/docs/basics.rst
@@ -29,8 +29,8 @@ by running ``python manage.py collectstatic``.
 This main static directory is not tracked by git,
 and therefore you should not put any content directly into this folder. 
 
-Puzzles should not be checked into the github repository.
-They should exist on some accessible online file source (we use dropbox)
+Puzzles should not be checked into the Github repository.
+They should exist on some accessible online file source (we use Dropbox)
 and will be downloaded and converted when the admin choses to do so.
 Once downloaded, the puzzle files live in ``{PROJECT FOLDER}/huntserver/static/huntserver/puzzles/``
 named using the puzzle ids that are unique. 
@@ -47,8 +47,8 @@ Websockets
 ----------
 This project accomplishes live page content with the use of websockets powered by ws4redis.
 These websockets are controlled by a redis message passing server running alongside the django server.
-This allows asychronous communication to the clients webpage,
-however communication from the webpage is synchronous with respect to the django server.
+This allows asynchronous communication to the clients webpage,
+however communication from the webpage is synchronous with respect to the Django server.
 This limitation is overcome by using POST requests as an asynchronous method of communication with the server from the client. 
 
 Database

diff --git a/docs/index.rst b/docs/index.rst
@@ -15,7 +15,7 @@ Features
 - Autogenerated page for each puzzle
 - Team user accounts and auth system
 - Customizable unlocking structure
-- Admin pages to manange submissions, teams, as well as hunt progress
+- Admin pages to manage submissions, teams, as well as hunt progress
 - Automatic team creation from registration
 - Privacy settings for each hunt
 - Cool charts!

diff --git a/docs/setup.rst b/docs/setup.rst
@@ -47,7 +47,7 @@ but those modifications are out of the scope of this setup.
 
 First we have to create the user and database that the application will use.
 To do so, log into the mysql client as a superuser and enter the following commands.
-(subsituting your password and username)
+(substituting your password and username)
 
 - ``CREATE DATABASE puzzlehunt_db;``
 - ``CREATE USER 'nottherealusername'@'localhost' IDENTIFIED BY 'nottherealpassword';``