geoserver/geoserver — pull request #120 by ccancellieri (2013-01-26 09:59:34+00:00)
Title: fix wms reference documentation merge

https://github.com/geoserver/geoserver/commit/f016f9098d9d3351715ecf12fb1ef9707be1b480#commitcomment-2504572
>Looks like some conflicts were committed in this file. Can you please fix these, and build >the documentation to make sure that no errors have been incorporated into the >documentation? Thanks.

This will fix documentation.