Merge branch 'keras-2' of github.com:fchollet/keras into keras-2

pjarosik · Mar 13, 2017 · 37e8234 · 37e8234
2 parents 640d1db + 3916e62
commit 37e8234
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docs/autogen.py b/docs/autogen.py
@@ -78,6 +78,7 @@
 from keras.layers import advanced_activations
 from keras.layers import embeddings
 from keras.layers import wrappers
+from keras.layers import merge
 from keras import optimizers
 from keras import callbacks
 from keras import models
@@ -224,7 +225,7 @@
     },
     {
         'page': 'layers/merge.md',
-        'all_module_classes': [keras.merge],
+        'all_module_classes': [merge],
     },
     {
         'page': 'layers/wrappers.md',

diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
@@ -45,7 +45,7 @@ pages:
 - Datasets: datasets.md
 - Applications: applications.md
 - Backend: backend.md
-- Initializations: initializations.md
+- Initializers: initializers.md
 - Regularizers: regularizers.md
 - Constraints: constraints.md
 - Visualization: visualization.md

diff --git a/docs/templates/activations.md b/docs/templates/activations.md
@@ -19,8 +19,8 @@ You can also pass an element-wise Tensorflow/Theano function as an activation:
 ```python
 from keras import backend as K
 
-model.add(Dense(64, activation=K.tanh)
-model.add(Activation(K.tanh)
+model.add(Dense(64, activation=K.tanh))
+model.add(Activation(K.tanh))
 ```
 
 ## Available activations