merge work brach

CONTRIBUTING.md

@@ -15,8 +15,8 @@ $ git remote add source [email protected]:DocsHome/nginx-docs.git
 
 ```bash
 $ git add .
-$ git commit -a "Fix issue #1: change helo to hello"
-$ git push origin/master
+$ git commit -am "Fix issue #1: change helo to hello"
+$ git push origin master
 ```
 
 * 在 GitHub 上提交 `pull request`。

README.md

@@ -1,8 +1,7 @@
-# Nginx 中文文档
-
-[![GitHub stars](https://img.shields.io/github/stars/DocsHome/nginx-docs.svg?style=social&label=Stars)](https://github.com/DocsHome/nginx-docs) [![GitHub pull requests](https://img.shields.io/github/issues-pr/DocsHome/nginx-docs.svg)](https://github.com/DocsHome/nginx-docs) [![GitHub last commit](https://img.shields.io/github/last-commit/DocsHome/nginx-docs.svg)](https://github.com/DocsHome/nginx-docs)
-
-![Nginx logo](https://nginx.org/nginx.png)
+<div align="center">
+    <img src="https://nginx.org/nginx.png" alt="Nginx">
+    <h1>Nginx 中文文档</h1>
+</div>
 
 Nginx 官方文档中文翻译版，由本人在学习 nginx 时顺带翻译。因部分章节涉及到 Nginx Plus 或者其他内容，我将忽略该部分章节的内容。
 
@@ -34,6 +33,14 @@ gitbook install
 gitbook serve
 ```
 
+**生成 HTML 文件，存放在 `_book` 目录下**
+
+```
+gitbook build
+```
+
+更多操作命令，请参照 GitBook 命令。
+
 ## 项目状态
 
 翻译中……

SUMMARY.md

@@ -87,14 +87,14 @@
     - [ngx_http_upstream_conf_module](模块参考/http/ngx_http_upstream_conf_module.md)
     - [ngx_http_upstream_hc_module](模块参考/http/ngx_http_upstream_hc_module.md)
     - [ngx_http_userid_module](模块参考/http/ngx_http_userid_module.md)
-    - ngx_http_uwsgi_module
-    - ngx_http_v2_module
-    - ngx_http_xslt_module
+    - [ngx_http_uwsgi_module](模块参考/http/ngx_http_uwsgi_module.md)
+    - [ngx_http_v2_module](模块参考/http/ngx_http_v2_module.md)
+    - [ngx_http_xslt_module](模块参考/http/ngx_http_xslt_module.md)
   - Mail
-    - ngx_mail_core_module
-    - ngx_mail_auth_http_module
-    - ngx_mail_proxy_module
-    - ngx_mail_ssl_module
+    - [ngx_mail_core_module](模块参考/mail/ngx_mail_core_module.md)
+    - [ngx_mail_auth_http_module](模块参考/mail/ngx_mail_auth_http_module.md)
+    - [ngx_mail_proxy_module](模块参考/mail/ngx_mail_proxy_module.md)
+    - [ngx_mail_ssl_module](模块参考/mail/ngx_mail_ssl_module.md)
     - [ngx_mail_imap_module](模块参考/mail/ngx_mail_imap_module.md)
     - [ngx_mail_pop3_module](模块参考/mail/ngx_mail_pop3_module.md)
     - [ngx_mail_smtp_module](模块参考/mail/ngx_mail_smtp_module.md)
@@ -104,17 +104,17 @@
     - [ngx_stream_geo_module](模块参考/stream/ngx_stream_geo_module.md)
     - [ngx_stream_geoip_module](模块参考/stream/ngx_stream_geoip_module.md)
     - [ngx_stream_js_module](模块参考/stream/ngx_stream_js_module.md)
-    - ngx_stream_keyval_module
+    - [ngx_stream_keyval_module](模块参考/stream/ngx_stream_keyval_module.md)
     - [ngx_stream_limit_conn_module](模块参考/stream/ngx_stream_limit_conn_module.md)
     - [ngx_stream_log_module](模块参考/stream/ngx_stream_log_module.md)
     - ngx_stream_map_module
-    - ngx_stream_proxy_module
+    - [ngx_stream_proxy_module](模块参考/stream/ngx_stream_proxy_module.md)
     - [ngx_stream_realip_module](模块参考/stream/ngx_stream_realip_module.md)
     - [ngx_stream_return_module](模块参考/stream/ngx_stream_return_module.md)
     - [ngx_stream_split_clients_module](模块参考/stream/ngx_stream_split_clients_module.md)
     - ngx_stream_ssl_module
     - [ngx_stream_ssl_preread_module](模块参考/stream/ngx_stream_ssl_preread_module.md)
-    - ngx_stream_upstream_module
+    - [ngx_stream_upstream_module](模块参考/stream/ngx_stream_upstream_module.md)
     - ngx_stream_upstream_hc_module
     - ngx_stream_zone_sync_module
   - 其他

book.json

@@ -1,5 +1,5 @@
 {
-  "title": "Nginx 文档中文译版",
+  "title": "Nginx中文文档",
   "author": "DocsHome",
   "language": "zh-hans",
   "links": {
@@ -15,19 +15,26 @@
     "favicon"
   ],
   "pluginsConfig": {
+    "github": {
+      "url": "https://github.com/DocsHome/nginx-docs"
+    },    
     "prism": {
       "css": [
         "prismjs/themes/prism-solarizedlight.css"
       ]
     },
-    "favicon": {
-      "shortcut": "favicon.ico",
-      "bookmark": "favicon.ico",
-      "appleTouch": "favicon.ico",
-      "appleTouchMore": {
-        "120x120": "favicon.ico",
-        "180x180": "favicon.ico"
-      }
+    "tbfed-pagefooter": {
+      "copyright": "Copyright &copy <a style=\"font-weight: bold\" href=\"https://github.com/DocsHome/nginx-docs\">Oopsguy.com</a> 2017",
+      "modify_label": "最后更新时间：",
+      "modify_format": "YYYY-MM-DD HH:mm:ss"
+    },
+    "github-buttons": {
+      "repo": "DocsHome/nginx-docs",
+      "types": [
+          "star",
+          "watch"
+      ],
+      "size": "small"
     }
   }
 }

模块参考/http/ngx_http_secure_link_module.md

@@ -1,4 +1,4 @@
-# ngx_http_scgi_module
+# ngx_http_secure_link_module
 
 - [指令](#directives)
     - [secure_link](#secure_link)