fix document deployment

f5ebd1a5 · Luo Tao · 86263b2f · f5ebd1a5 · f5ebd1a5 · f5ebd1a5
33 changed file
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ script:
    export DEPLOY_DOCS_SH=https://raw.githubusercontent.com/PaddlePaddle/PaddlePaddle.org/master/scripts/deploy/deploy_docs.sh
    export DOCS_DIR=`pwd`
    cd ..
-    curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $DOCS_DIR $DOCS_DIR/build/doc   
+    curl $DEPLOY_DOCS_SH | bash -s $CONTENT_DEC_PASSWD $TRAVIS_BRANCH $DOCS_DIR $DOCS_DIR/build/doc/v2   
 notifications:
  email:
    on_success: change

--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
-add_subdirectory(api)
 add_subdirectory(v2)
--- a/doc/v2/CMakeLists.txt
+++ b/doc/v2/CMakeLists.txt
@@ -47,3 +47,5 @@ sphinx_add_target(paddle_docs_cn
                  ${SPHINX_CACHE_DIR_CN}
                  ${CMAKE_CURRENT_SOURCE_DIR}
                  ${SPHINX_HTML_DIR_CN})
+add_subdirectory(api)
--- a/doc/api/CMakeLists.txt
+++ b/doc/api/CMakeLists.txt
@@ -8,7 +8,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}/../templates/conf.py.en.in"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../templates/conf.py.en.in"
    "${BINARY_BUILD_DIR_EN}/conf.py"
    @ONLY)

--- a/doc/api/v2/config/activation.rst
+++ b/doc/api/v2/config/activation.rst
--- a/doc/api/v2/config/attr.rst
+++ b/doc/api/v2/config/attr.rst
--- a/doc/api/v2/config/evaluators.rst
+++ b/doc/api/v2/config/evaluators.rst
--- a/doc/api/v2/config/layer.rst
+++ b/doc/api/v2/config/layer.rst
--- a/doc/api/v2/config/networks.rst
+++ b/doc/api/v2/config/networks.rst
--- a/doc/api/v2/config/optimizer.rst
+++ b/doc/api/v2/config/optimizer.rst
--- a/doc/api/v2/config/pooling.rst
+++ b/doc/api/v2/config/pooling.rst
--- a/doc/api/v2/data.rst
+++ b/doc/api/v2/data.rst
--- a/doc/api/v2/data/data_reader.rst
+++ b/doc/api/v2/data/data_reader.rst
--- a/doc/api/v2/data/dataset.rst
+++ b/doc/api/v2/data/dataset.rst
--- a/doc/api/v2/data/image.rst
+++ b/doc/api/v2/data/image.rst
--- a/doc/api/fluid/data_feeder.rst
+++ b/doc/api/fluid/data_feeder.rst
--- a/doc/api/fluid/evaluator.rst
+++ b/doc/api/fluid/evaluator.rst
--- a/doc/api/fluid/executor.rst
+++ b/doc/api/fluid/executor.rst
--- a/doc/api/fluid/gen_doc.py
+++ b/doc/api/fluid/gen_doc.py
--- a/doc/api/fluid/gen_doc.sh
+++ b/doc/api/fluid/gen_doc.sh
--- a/doc/api/fluid/index.rst
+++ b/doc/api/fluid/index.rst
--- a/doc/api/fluid/initializer.rst
+++ b/doc/api/fluid/initializer.rst
--- a/doc/api/fluid/io.rst
+++ b/doc/api/fluid/io.rst
--- a/doc/api/fluid/layers.rst
+++ b/doc/api/fluid/layers.rst
--- a/doc/api/fluid/nets.rst
+++ b/doc/api/fluid/nets.rst
--- a/doc/api/fluid/optimizer.rst
+++ b/doc/api/fluid/optimizer.rst
--- a/doc/api/fluid/param_attr.rst
+++ b/doc/api/fluid/param_attr.rst
--- a/doc/api/fluid/profiler.rst
+++ b/doc/api/fluid/profiler.rst
--- a/doc/api/fluid/regularizer.rst
+++ b/doc/api/fluid/regularizer.rst
--- a/doc/api/index_en.rst
+++ b/doc/api/index_en.rst
@@ -5,7 +5,7 @@ API
    :maxdepth: 1
    overview.rst
-    v2/model_configs.rst
+    model_configs.rst
-    v2/data.rst
+    data.rst
-    v2/run_logic.rst
+    run_logic.rst
    fluid/index.rst
--- a/doc/api/v2/model_configs.rst
+++ b/doc/api/v2/model_configs.rst
--- a/doc/api/overview.rst
+++ b/doc/api/overview.rst
--- a/doc/api/v2/run_logic.rst
+++ b/doc/api/v2/run_logic.rst