Update the conv2d doc to hopefully make it more clear.
Fix the doc generation.
Merge pull request #1286 from nouiz/conv_doc

Update the conv2d doc to hopefully make it more clear.