From 33334883fa0499c9e2ce88c508a5c9ef29ffeffc Mon Sep 17 00:00:00 2001
From: Alex Rubinsteyn <alex.rubinsteyn@gmail.com>
Date: Tue, 16 Jun 2015 12:58:52 -0400
Subject: [PATCH] Added Convolution1D and MaxPooling1D to layers documentation

---
 docs/sources/layers/convolutional.md | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/docs/sources/layers/convolutional.md b/docs/sources/layers/convolutional.md
index d9d36c86a..79045d11e 100644
--- a/docs/sources/layers/convolutional.md
+++ b/docs/sources/layers/convolutional.md
@@ -1,4 +1,18 @@
 
+## Convolution1D
+
+```python
+keras.layers.convolutional.Convolution1D(nb_filter, stack_size, filter_length, 
+        init='uniform', activation='linear', weights=None, 
+        image_shape=None, border_mode='valid', subsample_length=1, 
+        W_regularizer=None, b_regularizer=None, W_constraint=None, 
+        b_constraint=None)
+```
+
+Convolution operator for filtering neighborhoods of one-dimensional inputs.
+
+---
+
 ## Convolution2D
 
 ```python
@@ -7,10 +21,17 @@ keras.layers.convolutional.Convolution2D(nb_filter, stack_size, nb_row, nb_col,
         image_shape=None, border_mode='valid', subsample=(1,1))
 ```
 
-This is a wrapper for Theano's [conv2d](http://deeplearning.net/software/theano/library/tensor/nnet/conv.html#theano.tensor.nnet.conv.conv2d). 
+Convolution operator for filtering windows of two-dimensional inputs. This is a wrapper for Theano's [conv2d](http://deeplearning.net/software/theano/library/tensor/nnet/conv.html#theano.tensor.nnet.conv.conv2d). 
 
 ---
 
+## MaxPooling1D
+
+```python
+keras.layers.convolutional.MaxPooling1D(pool_length=2, ignore_border=True)
+```
+---
+
 ## MaxPooling2D
 
 ```python