fix conflict, move doc/conf.py.in to doc/templates

doc/CMakeLists.txt

@@ -16,7 +16,7 @@ set(SPHINX_CACHE_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/_doctrees")
 set(SPHINX_HTML_DIR_EN "${CMAKE_CURRENT_BINARY_DIR}/en/html")
 
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.en.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/templates/conf.py.en.in"
     "${BINARY_BUILD_DIR_EN}/conf.py"
     @ONLY)
 
@@ -41,7 +41,7 @@ set(SPHINX_CACHE_DIR_CN "${CMAKE_CURRENT_BINARY_DIR}/cn/_doctrees")
 set(SPHINX_HTML_DIR_CN "${CMAKE_CURRENT_BINARY_DIR}/cn/html")
 
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/conf.py.cn.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/templates/conf.py.cn.in"
     "${BINARY_BUILD_DIR_CN}/conf.py"
     @ONLY)
 

doc/about/index_en.rst

@@ -11,4 +11,4 @@ We hope to build an active open source community both by providing feedback and
 Credits
 --------
 
-We owe many thanks to `all contributors and developers <https://github.com/PaddlePaddle/Paddle/blob/develop/authors>`_ of PaddlePaddle!
+We owe many thanks to `all contributors and developers <https://github.com/PaddlePaddle/Paddle/graphs/contributors>`_ of PaddlePaddle!

doc/howto/index_cn.rst

 进阶指南
 ========
 
-使用
-----
+使用说明
+--------
 
 ..  toctree::
   :maxdepth: 1
@@ -11,24 +11,24 @@
   usage/cluster/k8s/k8s_cn.md
   usage/cluster/k8s/k8s_distributed_cn.md
 
-开发
-----
+开发标准
+--------
 
 ..  toctree::
   :maxdepth: 1
 
   dev/write_docs_cn.rst
 
-配置
-----
+模型配置
+--------
 
 ..  toctree::
   :maxdepth: 1
 
   deep_model/rnn/index_cn.rst
 
-优化
-----
+性能优化
+--------
 
 ..  toctree::
   :maxdepth: 1