Merge branch 'dev' of github.com:gogits/gogs into dev

dockerfiles/README.md

@@ -1,6 +1,6 @@
 ### Install Gogs With Docker
 
-Deplying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the confis:
+Deploying gogs in [Docker](http://www.docker.io/) is just as easy as eating a pie, what you do is just open the `dockerfiles/build.sh` file, replace the configs:
 
 ```
 DB_TYPE="YOUR_DB_TYPE"            # type of database, support 'mysql' and 'postgres'
@@ -37,4 +37,4 @@ http://YOUR_HOST_IP:YOUR_HOST_PORT
 ```
 
 Let's 'gogs'!
-Ouya~
+Ouya~