From 3d560c517983f519bd2d85fdd5142cae8a35fb60 Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Thu, 15 Dec 2016 12:59:40 +0800
Subject: [PATCH] fix conflict, move doc/conf.py.in to doc/templates

---
 doc/CMakeLists.txt                |  4 ++--
 doc/about/index_en.rst            |  2 +-
 doc/howto/index_cn.rst            | 16 ++++++++--------
 doc/{ => templates}/conf.py.cn.in |  0
 doc/{ => templates}/conf.py.en.in |  0
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename doc/{ => templates}/conf.py.cn.in (100%)
 rename doc/{ => templates}/conf.py.en.in (100%)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 1b0fbadeb..6fa42fd0c 100644
--- a/doc/CMakeLists.txt
+++ b/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)
 
diff --git a/doc/about/index_en.rst b/doc/about/index_en.rst
index 8a372d2bc..065c430cd 100644
--- a/doc/about/index_en.rst
+++ b/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!
diff --git a/doc/howto/index_cn.rst b/doc/howto/index_cn.rst
index 805b63f04..618f0c6e7 100644
--- a/doc/howto/index_cn.rst
+++ b/doc/howto/index_cn.rst
@@ -1,8 +1,8 @@
 进阶指南
 ========
 
-使用
-----
+使用说明
+--------
 
 ..  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
diff --git a/doc/conf.py.cn.in b/doc/templates/conf.py.cn.in
similarity index 100%
rename from doc/conf.py.cn.in
rename to doc/templates/conf.py.cn.in
diff --git a/doc/conf.py.en.in b/doc/templates/conf.py.en.in
similarity index 100%
rename from doc/conf.py.en.in
rename to doc/templates/conf.py.en.in
-- 
GitLab