modify api doc catalog

doc/api/index_cn.rst

@@ -1,26 +1,9 @@
 API
 ===
 
-模型配置 API
-------------
-
 ..  toctree::
     :maxdepth: 1
 
-    v2/model_configs.rst
+    模型配置 <v2/model_configs.rst>
-
+    数据访问 <v2/data.rst>
-数据 API
+    训练与应用 <v2/run_logic.rst>
---------
-
-..  toctree::
-    :maxdepth: 1
-
-    v2/data.rst
-
-训练 API
---------
-
-..	toctree::
-	:maxdepth: 1
-
-	v2/run_logic.rst

doc/api/index_en.rst

@@ -1,26 +1,9 @@
 API
 ===
 
-Model Config API
-----------------
-
 ..  toctree::
     :maxdepth: 1
 
     v2/model_configs.rst
-
-Data API
---------
-
-..  toctree::
-    :maxdepth: 1
-
     v2/data.rst
-
+    v2/run_logic.rst
-Train API
----------
-
-..	toctree::
-	:maxdepth: 1
-
-	v2/run_logic.rst

doc/api/v2/config/activation.rst

@@ -0,0 +1,101 @@
+===========
+Activation
+===========
+
+Abs
+===
+
+..  automodule:: paddle.v2.activation
+    :members: Abs
+    :noindex:
+    
+Exp
+===
+
+..  automodule:: paddle.v2.activation
+    :members: Exp
+    :noindex:
+    
+Identity
+========
+
+..  automodule:: paddle.v2.activation
+    :members: Identity
+    :noindex:
+    
+Linear
+======
+
+..  automodule:: paddle.v2.activation
+    :members: Linear
+    :noindex:
+
+Log
+===
+
+..  automodule:: paddle.v2.activation
+    :members: Log
+    :noindex:
+    
+Square
+======
+
+..  automodule:: paddle.v2.activation
+    :members: Square
+    :noindex:
+    
+Sigmoid
+=======
+
+..  automodule:: paddle.v2.activation
+    :members: Sigmoid
+    :noindex:
+    
+Softmax
+=======
+
+..  automodule:: paddle.v2.activation
+    :members: Softmax
+    :noindex:
+    
+SequenceSoftmax
+===============
+
+..  automodule:: paddle.v2.activation
+    :members: SequenceSoftmax
+    :noindex:
+    
+Relu
+====
+
+..  automodule:: paddle.v2.activation
+    :members: Relu
+    :noindex:
+    
+BRelu
+=====
+
+..  automodule:: paddle.v2.activation
+    :members: BRelu
+    :noindex:
+    
+SoftRelu
+========
+
+..  automodule:: paddle.v2.activation
+    :members: SoftRelu
+    :noindex:
+    
+Tanh
+====
+
+..  automodule:: paddle.v2.activation
+    :members: Tanh
+    :noindex:
+    
+STanh
+=====
+
+..  automodule:: paddle.v2.activation
+    :members: STanh
+    :noindex:

doc/api/v2/config/attr.rst

@@ -0,0 +1,6 @@
+Parameter Attribute
+===================
+
+..  automodule:: paddle.v2.attr
+    :members:
+    :noindex:

doc/api/v2/config/networks.rst

@@ -0,0 +1,117 @@
+========
+Networks
+========
+
+The v2.networks module contains pieces of neural network that combine multiple layers.
+
+NLP
+===
+
+sequence_conv_pool
+------------------
+..  automodule:: paddle.v2.networks
+    :members: sequence_conv_pool
+    :noindex:
+
+..  _api_trainer_config_helpers_network_text_conv_pool:
+
+text_conv_pool
+--------------
+..  automodule:: paddle.v2.networks
+    :members: text_conv_pool
+    :noindex:
+
+Images
+======
+
+img_conv_bn_pool
+----------------
+..  automodule:: paddle.v2.networks
+    :members: img_conv_bn_pool
+    :noindex:
+
+img_conv_group
+--------------
+..  automodule:: paddle.v2.networks
+    :members: img_conv_group
+    :noindex:
+
+..  _api_trainer_config_helpers_network_simple_img_conv_pool:
+
+simple_img_conv_pool
+--------------------
+..  automodule:: paddle.v2.networks
+    :members: simple_img_conv_pool
+    :noindex:
+
+vgg_16_network
+---------------
+..  automodule:: paddle.v2.networks
+    :members: vgg_16_network
+    :noindex:
+
+Recurrent
+=========
+
+LSTM
+----
+
+lstmemory_unit
+``````````````
+..  automodule:: paddle.v2.networks
+    :members: lstmemory_unit
+    :noindex:
+
+lstmemory_group
+```````````````
+..  automodule:: paddle.v2.networks
+    :members: lstmemory_group
+    :noindex:
+
+simple_lstm
+```````````
+..  automodule:: paddle.v2.networks
+    :members: simple_lstm
+    :noindex:
+
+bidirectional_lstm
+``````````````````
+..  automodule:: paddle.v2.networks
+    :members: bidirectional_lstm
+    :noindex:
+
+GRU
+---
+
+gru_unit
+````````
+..  automodule:: paddle.v2.networks
+    :members: gru_unit
+    :noindex:
+
+gru_group
+`````````
+..  automodule:: paddle.v2.networks
+    :members: gru_group
+    :noindex:
+
+simple_gru
+``````````
+..  automodule:: paddle.v2.networks
+    :members: simple_gru
+    :noindex:
+
+simple_attention
+----------------
+..  automodule:: paddle.v2.networks
+    :members: simple_attention
+    :noindex:
+
+Miscs
+=====
+
+dropout_layer
+--------------
+..  automodule:: paddle.v2.networks
+    :members: dropout_layer
+    :noindex:

doc/api/v2/config/optimizer.rst

@@ -0,0 +1,47 @@
+..  _api_v2.optimizer:
+
+==========
+Optimizer
+==========
+
+Momentum
+========
+..  automodule:: paddle.v2.optimizer
+    :members: Momentum
+    :noindex:
+
+Adam
+====
+..  automodule:: paddle.v2.optimizer
+    :members: Adam
+    :noindex:
+
+Adamax
+======
+..  automodule:: paddle.v2.optimizer
+    :members: Adamax
+    :noindex:
+
+AdaGrad
+=======
+..  automodule:: paddle.v2.optimizer
+    :members: AdaGrad
+    :noindex:
+
+DecayedAdaGrad
+==============
+..  automodule:: paddle.v2.optimizer
+    :members: DecayedAdaGrad
+    :noindex:
+
+AdaDelta
+========
+..  automodule:: paddle.v2.optimizer
+    :members: AdaDelta
+    :noindex:
+
+RMSProp
+=======
+..  automodule:: paddle.v2.optimizer
+    :members: RMSProp
+    :noindex:

doc/api/v2/config/pooling.rst

@@ -0,0 +1,46 @@
+=======
+Pooling
+=======
+
+BasePool
+========
+..  automodule:: paddle.v2.pooling
+    :members: BasePool
+    :noindex:
+
+Avg
+===
+..  automodule:: paddle.v2.pooling
+    :members: Avg
+    :noindex:
+
+Max
+===
+..  automodule:: paddle.v2.pooling
+    :members: Max
+    :noindex:
+
+Sum
+===
+..  automodule:: paddle.v2.pooling
+    :members: Sum
+    :noindex:
+
+SquareRootN
+===========
+..  automodule:: paddle.v2.pooling
+    :members: SquareRootN
+    :noindex:
+
+CudnnAvg
+========
+..  automodule:: paddle.v2.pooling
+    :members: CudnnAvg
+    :noindex:
+
+CudnnMax
+========
+..  automodule:: paddle.v2.pooling
+    :members: CudnnMax
+    :noindex:
+

doc/api/v2/data.rst

@@ -1,52 +1,53 @@
-================
+========
-Data Related API
+Datasets
-================
+========
 
 
-#########
 DataTypes
-#########
+=========
 
 ..  automodule:: paddle.v2.data_type
     :members:
+    :noindex:
 
-##########
 DataFeeder
-##########
+==========
 
 ..  automodule:: paddle.v2.data_feeder
     :members:
+    :noindex:
 
-######
 Reader
-######
+======
 
 ..  automodule:: paddle.v2.reader
     :members:
+    :noindex:
 
 ..  automodule:: paddle.v2.reader.creator
     :members:
+    :noindex:
 
-#########
 minibatch
-#########
+=========
 
 ..  automodule:: paddle.v2.minibatch
     :members:
+    :noindex:
 
-#######
 Dataset
-#######
+=======
 
 ..  automodule:: paddle.v2.dataset
     :members:
-
+    :noindex:
 
 mnist
 +++++
 
 ..  automodule:: paddle.v2.dataset.mnist
     :members:
+    :noindex:
 
 
 cifar
@@ -54,40 +55,54 @@ cifar
 
 ..  automodule:: paddle.v2.dataset.cifar
     :members:
+    :noindex:
 
 conll05
 +++++++
 
 ..  automodule:: paddle.v2.dataset.conll05
     :members:
+    :noindex:
 
 imdb
 ++++
 
 ..  automodule:: paddle.v2.dataset.imdb
     :members:
+    :noindex:
 
 imikolov
 ++++++++
 
 ..  automodule:: paddle.v2.dataset.imikolov
     :members:
+    :noindex:
 
 movielens
 +++++++++
 
 ..  automodule:: paddle.v2.dataset.movielens
     :members:
+    :noindex:
 
 sentiment
 +++++++++
 
 ..  automodule:: paddle.v2.dataset.sentiment
     :members:
+    :noindex:
 
 uci_housing
 +++++++++++
 
 ..  automodule:: paddle.v2.dataset.uci_housing
     :members:
+    :noindex:
+
+wmt14
++++++
+
+..  automodule:: paddle.v2.dataset.uci_housing
+    :members:
+    :noindex:
 

doc/api/v2/model_configs.rst

@@ -1,46 +1,12 @@
-#########################
+Model Configuration
-Configuration Related API
+===================
-#########################
+
-
+..  toctree::
-======
+    :maxdepth: 1
-Layers
+
-======
+    config/activation.rst
-
+    config/layer.rst
-..  automodule:: paddle.v2.layer
+    config/optimizer.rst
-    :members:
+    config/pooling.rst
-
+    config/networks.rst
-
+    config/attr.rst
-==========
-Attributes
-==========
-
-..	automodule:: paddle.v2.attr
-	:members:
-
-===========
-Activations
-===========
-
-..	automodule:: paddle.v2.activation
-	:members:
-
-========
-Poolings
-========
-
-..	automodule:: paddle.v2.pooling
-	:members:
-
-========
-Networks
-========
-
-..	automodule:: paddle.v2.networks
-	:members:
-
-==========
-Optimizers
-==========
-
-..	automodule:: paddle.v2.optimizer
-	:members:

doc/api/v2/run_logic.rst

@@ -1,34 +1,27 @@
-###########
+======================
-Trainer API
+Training and Inference
-###########
+======================
 
-
-==========
 Parameters
 ==========
 
 ..  automodule:: paddle.v2.parameters
-    :members:
+    :noindex:
 
-
-=======
 Trainer
 =======
 
-..	automodule:: paddle.v2.trainer
+..  automodule:: paddle.v2.trainer
-	:members:
+    :noindex:
 
-
-=====
 Event
 =====
 
-..	automodule:: paddle.v2.event
+..  automodule:: paddle.v2.event
-	:members:
+    :noindex:
 
-
-=========
 Inference
 =========
 
-..	autofunction:: paddle.v2.infer
+..  autofunction:: paddle.v2.infer
+    :noindex: