上传新版样式

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+要热忱，也要在路上。
+
+https://www.kennethreitz.org/essays/be-cordial-or-be-on-your-way

Contributing.md

@@ -5,6 +5,29 @@
 
 http://docs.python-guide.org/en/latest/notes/contribute/
 
+如何测试你的修改
+------------------------
+
+The html version of this guide is built with [sphinx](http://www.sphinx-doc.org/en/stable/). You may test your revisions locally by having sphinx installed. You can do this easily with pip (as described in the link).
+
+``` bash
+pip install --user sphinx
+```
+
+Then navigate to the directory of the makefile and ```make build``` or ```make html```. Sphinx will then generate the html in a folder called _build/html
+
+After navigating to this folder, you can then use python's built in webserver to view your changes locally:
+
+``` bash
+python3 -m http.server
+```
+
+By default, http.server listens on every ip address bound on your host on port 8000. To bind to a specific one, say, localhost on port 8005:
+
+``` bash
+python3 -m http.server 8005 --bind 127.0.0.1
+```
+
 
 风格指南
 -----------

Readme.rst

@@ -1,7 +1,5 @@
 Python最佳实践指南中文版
 ============================
-**翻译项目已基本完成，接下来就是持续跟进原项目进度。目前没有特别好的方法能够及时获知原项目进行了哪些相对于本项目的更新，也就不能很好地跟进翻译。欢迎有经验的伙伴贡献解决方案。**
-
 项目翻译自 `Hitchhiker's Guide to Python <https://github.com/kennethreitz/python-guide>`_。
 
 Readthedocs文档地址 `Python最佳实践指南中文版 <http://pythonguidecn.readthedocs.org/>`_。
@@ -17,7 +15,7 @@ Readthedocs文档地址 `Python最佳实践指南中文版 <http://pythonguidecn
 - 不同平台和系统上的安装
 - Py2app, Py2exe, bbfreeze, pyInstaller
 - Pip
-- Numpy, scipy, statpy, pylot, matlib
+- Numpy, scipy, statpy, pyplot, matplotlib
 - Virtualenv
 - Fabric
 - 优秀的模块推荐，按主题/目的分类
@@ -42,7 +40,7 @@ Readthedocs文档地址 `Python最佳实践指南中文版 <http://pythonguidecn
 
 -----------
 
-翻译进度（已完成）
+翻译进度（进行中）
 ============================
 Getting Started（开始吧）（完成）
 ---------------------------
@@ -100,6 +98,6 @@ Additional Notes（额外关注）（完成）
 
 其他（完成）
 ---------------------------
-- Contribute（贡献）（完成）
+- Contribute（贡献）（进行中）
 - License（许可证）（完成）
 - The Guide Style Guide（风格指南指引）（完成）

diff/last_commit

@@ -0,0 +1 @@
+6e4eb1f9a659a1875e6582fdd9bb5341ebaa5f14

docs/_templates/hacks.html

@@ -0,0 +1,14 @@
+<script type="text/javascript">
+  var _gauges = _gauges || [];
+  (function() {
+    var t   = document.createElement('script');
+    t.type  = 'text/javascript';
+    t.async = true;
+    t.id    = 'gauges-tracker';
+    t.setAttribute('data-site-id', '56ca79a64b2ffa7a470027ea');
+    t.setAttribute('data-track-path', 'https://track.gaug.es/track.gif');
+    t.src = 'https://d36ee2fcip1434.cloudfront.net/track.js';
+    var s = document.getElementsByTagName('script')[0];
+    s.parentNode.insertBefore(t, s);
+  })();
+</script>

docs/_templates/sidebarintro.html

@@ -1,22 +1,55 @@
-<h1>Python 指南</h1>
+<p class="logo">
+  <a href="{{ pathto(master_doc) }}">
+    <img class="logo" src="{{ pathto('_static/python-guide-logo.png', 1) }}" title="Python最佳实践指南"/>
+  </a>
+</p>
+
 <p>
   这份主要是自我见解的指南旨在为Python初学者和专家提供一个关于Python安装、配置、和日常使用的最佳实践手册。
 </p>
 
-<h3>获取更新</h3>
+<h3>得到通知</h3>
 <p>获得新版本和未来项目的更新。</p>
 
-<p><a href="http://tinyletter.com/kennethreitz">订阅Newsletter</a></p>
+<p><iframe src="http://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
+  allowtransparency="true" frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
 
-<h3>捐助</h3>
-<p>
-    如果你享受这份指南,想要支持作者，<a href="https://www.gittip.com/kennethreitz/"> 请戳Gittip</a>。
-</p>
-<p>
-  <iframe style="border: 0; margin: 0; padding: 0;"
-      src="https://www.gittip.com/kennethreitz/widget.html"
-      width="60pt" height="20pt"></iframe>
-</p>
+<p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
+
+<p><a href="http://tinyletter.com/kennethreitz">加入邮件列表</a>.</p>
+<p><a href="https://saythanks.io/to/kennethreitz">表示感谢</a></p>
+
+
+<a href="http://www.datacamp.com/?utm_source=python_guide&utm_campaign=display">
+<img src="{{ pathto('_static/ad.png', 1) }}" alt="">
+</a>
+
+<hr>
+
+<h3>O'Reilly 书籍</h3>
+
+<p>这份指南现在有纸质版啦！</p>
+
+<a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
+
+<p>所有的收入都直接捐赠给 <a href="https://djangogirls.org">DjangoGirls</a> 组织。</p>
+
+
+
+<h3>其他项目</h3>
+
+<p>更多 <a href="http://kennethreitz.org/">Kenneth Reitz</a> 项目：</p>
+<ul>
+    <li><a href="http://wsl-guide.org/">wsl-guide.org</a></li>
+    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://pipenv.org/">pipenv</a></li>
+    <li><a href="http://pep8.org/">pep8.org</a></li>
+    <li><a href="http://python-requests.org">Requests: HTTP for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/maya">Maya: Datetimes for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/records">Records: SQL for Humans</a></li>
+    <li><a href="http://www.git-legit.org">Legit: Git for Humans</a></li>
+    <li><a href="http://docs.python-tablib.org/en/latest/">Tablib: Tabular Datasets</a></li>
+</ul>
 
 <h3>贡献者</h3>
 <p>
@@ -34,3 +67,13 @@ <h3>有用的链接</h3>
   <li><a href="http://github.com/kennethreitz/python-guide/issues">Issue追踪</a></li>
   <li><a href="https://media.readthedocs.org/pdf/python-guide/latest/python-guide.pdf">Python指南PDF版</a></li>
 </ul>
+
+<h3>翻译</h3>
+<ul>
+  <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
+  <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
+  <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
+  <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
+  <li><a href="https://python-guide-kr.readthedocs.io/ko/latest/">Korean</a></li>
+  <li><a href="http://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
+</ul>

docs/_templates/sidebarlogo.html

@@ -1,19 +1,60 @@
-<h1><a href="http://python-guide.org">Python 指南</a></h1>
+<p class="logo">
+  <a href="{{ pathto(master_doc) }}">
+    <img class="logo" src="{{ pathto('_static/python-guide-logo.png', 1) }}" title="Python最佳实践指南"/>
+  </a>
+</p>
+
 <p>
   本指南目前持续不断地更新与完善。这份主要是自我见解的指南旨在为Python初学者和专家提供一个关于Python安装、配置、和日常使用的最佳实践手册。
 </p>
 
 <h3>获取更新</h3>
 <p>获得新版本和未来项目的更新。</p>
 
-<p><a href="http://tinyletter.com/kennethreitz">订阅Newsletter</a></p>
+<p><iframe src="http://ghbtns.com/github-btn.html?user=kennethreitz&type=follow&count=false"
+  allowtransparency="true" frameborder="0" scrolling="0" width="200" height="20"></iframe></p>
 
-<h3>捐助</h3>
-<p>
-    如果你享受这份指南,想要支持作者，<a href="https://www.gittip.com/kennethreitz/"> 请戳Gittip</a>。
-</p>
-<p>
-  <iframe style="border: 0; margin: 0; padding: 0;"
-      src="https://www.gittip.com/kennethreitz/widget.html"
-      width="60pt" height="20pt"></iframe>
-</p>
+<p><a href="https://twitter.com/kennethreitz" class="twitter-follow-button" data-show-count="false">Follow @kennethreitz</a> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></p>
+<p><a href="https://saythanks.io/to/kennethreitz">表示感谢</a></p>
+<p><a href="http://tinyletter.com/kennethreitz">加入邮件列表</a>.</p>
+
+<a href="http://www.datacamp.com/?utm_source=python_guide&utm_campaign=display">
+<img src="{{ pathto('_static/ad.png', 1) }}" alt="">
+</a>
+
+<hr>
+
+<h3>O'Reilly 书籍</h3>
+
+<p>这份指南现在有纸质版啦！</p>
+
+<a href="https://www.amazon.com/Hitchhikers-Guide-Python-Practices-Development/dp/1491933178/ref=as_li_ss_il?ie=UTF8&linkCode=li2&tag=bookforkind-20&linkId=804806ebdacaf3b56567347f3afbdbca" target="_blank"><img border="0" src="https://ws-na.amazon-adsystem.com/widgets/q?_encoding=UTF8&ASIN=1491933178&Format=_SL160_&ID=AsinImage&MarketPlace=US&ServiceVersion=20070822&WS=1&tag=bookforkind-20" ></a><img src="//ir-na.amazon-adsystem.com/e/ir?t=bookforkind-20&l=li2&o=1&a=1491933178" width="1" height="1" border="0" alt="" style="border:none !important; margin:0px !important;" />
+
+<p>所有的收入都直接捐赠给 <a href="https://djangogirls.org">DjangoGirls</a> 组织。</p>
+
+
+
+<h3>其他项目</h3>
+
+<p>更多 <a href="http://kennethreitz.org/">Kenneth Reitz</a> 项目：</p>
+<ul>
+    <li><a href="http://wsl-guide.org/">wsl-guide.org</a></li>
+    <li><a href="http://edmsynths.com/">edmsynths.com</a></li>
+    <li><a href="http://pipenv.org/">pipenv</a></li>
+    <li><a href="http://pep8.org/">pep8.org</a></li>
+    <li><a href="http://python-requests.org">Requests: HTTP for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/maya">Maya: Datetimes for Humans</a></li>
+    <li><a href="https://github.com/kennethreitz/records">Records: SQL for Humans</a></li>
+    <li><a href="http://www.git-legit.org">Legit: Git for Humans</a></li>
+    <li><a href="http://docs.python-tablib.org/en/latest/">Tablib: Tabular Datasets</a></li>
+</ul>
+
+<h3>翻译</h3>
+<ul>
+  <li><a href="http://docs.python-guide.org/en/latest/">English</a></li>
+  <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
+  <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
+  <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
+  <li><a href="https://python-guide-kr.readthedocs.io/ko/latest/">Korean</a></li>
+  <li><a href="http://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
+</ul>