documentation fixes

doc/extending/cop.txt

@@ -62,7 +62,8 @@ There are less methods to define for an Op than for a Type:
       we will be able to have the shape without its computation.
       must return a tuple with one tuple with the shape of each output.
       Example of matrix-matrix product input_shapes will have as input
-      (node, ((x0,x1), (y0,y1))) and should return ((x0, y1)).
+      (node, ((x0,x1), (y0,y1))) and should return [(x0, y1)]. Both the
+      inputs and the return value may be theano variables.
 
 The ``name`` argument is currently given an invalid value, so steer
 away from it. As was the case with Type, ``sub['fail']`` provides

doc/library/tensor/basic.txt

@@ -466,6 +466,9 @@ TensorVariable
 
         See :func:`dimshuffle`.
 
+        (The above link just points back to this paragraph. Maybe whoever
+        wrote that meant to refer to theano.tensor.DimShuffle)
+
         
 
 

theano/tensor/opt.py

@@ -553,7 +553,8 @@ class ShapeFeature(object):
         # an element of o_shapes is either None or a tuple
         #   elements of the tuple can be either strings, or ints
 
-        assert len(o_shapes) == len(node.outputs)
+        if len(o_shapes) != len(node.outputs):
+            raise Exception('len(o_shapes) = '+str(len(o_shapes))+' != len(node.outputs) = '+str(len(node.outputs)))
 
         for r, s in zip(node.outputs, o_shapes):
             self.set_shape(r, s)