Merge pull request #478 from luotao1/doc2

modify first level directory of english doc

doc/algorithm/index.rst

@@ -0,0 +1,7 @@
+Algorithm Tutorial
+==================
+
+..  toctree::
+  :maxdepth: 1
+
+  rnn/rnn.rst

doc/algorithm/rnn/rnn.rst

@@ -1,5 +1,5 @@
-Recurrent Neural Network Configuration
-======================================
+RNN Configuration
+=================
 
 This tutorial will guide you how to configure recurrent neural network in PaddlePaddle. PaddlePaddle supports highly flexible and efficient recurrent neural network configuration. In this tutorial, you will learn how to:
 

doc/build/contribute_to_paddle.md

@@ -1,4 +1,4 @@
-# Contribute to PaddlePaddle
+# Contribute Code
 
 We sincerely appreciate your contributions. You can use fork and pull request
 workflow to merge your code. 

doc/build/index.rst

@@ -1,5 +1,5 @@
-Build And Install PaddlePaddle
-================================
+Install and Build
+=================
 
 Install PaddlePaddle
 ----------------------
@@ -18,11 +18,7 @@ Build from Source
 
 ..  warning::
 
-    Please use :code:`deb` package or :code:`docker` image to install paddle. The building guide is used for hacking or contributing to PaddlePaddle.
-    
-
-If you want to hack and contribute PaddlePaddle source code, following guides can help you\:
-
+    Please use :code:`deb` package or :code:`docker` image to install paddle. The building guide is used for hacking or contributing PaddlePaddle source code.
 
 ..  toctree::
     :maxdepth: 1
@@ -30,4 +26,3 @@ If you want to hack and contribute PaddlePaddle source code, following guides ca
 
     build_from_source.md
     contribute_to_paddle.md
-

doc/demo/quick_start/index_en.md

@@ -1,4 +1,4 @@
-# Quick Start Tutorial
+# Quick Start
 
 This tutorial will teach the basics of deep learning (DL), including how to implement many different models in PaddlePaddle. You will learn how to:
   - Prepare data into the standardized format that PaddlePaddle accepts.

doc/dev/index.rst

@@ -0,0 +1,9 @@
+Development Guide
+=================
+
+..  toctree::
+  :maxdepth: 1
+
+  layer.md
+  new_layer/new_layer.rst
+  ../source/index.md

doc/dev/layer.md

@@ -0,0 +1,4 @@
+# Layer Documents
+
+* [Layer Source Code Document](../source/gserver/layers/index.rst)
+* [Layer Python API Document](../ui/api/trainer_config_helpers/index.rst)

doc/dev/new_layer/index.rst

@@ -1,7 +0,0 @@
-Writing New Layers
-==================
-
-.. toctree::
-  :maxdepth: 3
-
-  new_layer.rst

doc/dev/new_layer/new_layer.rst

@@ -1,3 +1,4 @@
+==================
 Writing New Layers
 ==================
 

doc/index.md

@@ -1,23 +0,0 @@
-PaddlePaddle Documentation
-==========================
-
-User Guide
-----------
-* [Introduction](introduction/index.md)
-* [Quick Start](demo/quick_start/index_en.md)
-* [Build and Installation](build/index.rst)
-* [Contribute Code](build/contribute_to_paddle.md)
-* [User Interface](ui/index.md)
-* [Model Config Interface](ui/api/trainer_config_helpers/index.rst)
-* [Example and Demo](demo/index.md)
-* [Cluster Train](cluster/index.md)
-
-Development Guide
------------------
-* [Layer Documents](layer.md)
-* [Writing New Layers](dev/new_layer/index.rst)
-* [Source Code Documents](source/index.md)
-
-Algorithm Tutorial
-------------------
-* [RNN Configuration](algorithm/rnn/rnn.rst)

doc/index.rst

@@ -0,0 +1,10 @@
+PaddlePaddle Documentation
+==========================
+
+..  toctree::
+  :maxdepth: 1
+
+  introduction/index.md
+  user_guide.rst
+  dev/index.rst
+  algorithm/index.rst

doc/layer.md

@@ -1,4 +0,0 @@
-# Layer Documents
-
-* [Layer Source Code Document](source/gserver/layers/index.rst)
-* [Layer Python API Document](ui/api/trainer_config_helpers/layers_index.rst)

doc/ui/api/trainer_config_helpers/layers.rst

@@ -192,7 +192,7 @@ embedding_layer
     :noindex:
 
 scaling_projection
------------------
+------------------
 ..  automodule:: paddle.trainer_config_helpers.layers
     :members: scaling_projection
     :noindex:

doc/user_guide.rst

@@ -0,0 +1,13 @@
+User Guide
+==========
+
+..  toctree::
+  :maxdepth: 1
+
+  demo/quick_start/index_en.md
+  build/index.rst
+  build/contribute_to_paddle.md
+  ui/index.md
+  ui/api/trainer_config_helpers/index.rst
+  demo/index.md
+  cluster/index.md

python/paddle/trainer_config_helpers/layers.py

@@ -3807,6 +3807,7 @@ def linear_comb_layer(weights, vectors, size=None, name=None, layer_attr=None):
     .. math::
 
        z(i) = \sum_{j=0}^{M-1} x(j) y(i+Nj)
+
     where :math:`0 \le i \le N-1`
 
     Or in the matrix notation: