LRDOCS-818 Fix section on extending a JSP. Use Liferay IDE in creating custom JSP.
LRDOCS-811: Rewrite Google Map gadget (6.1.x)
LRDOCS-811: Update Google Map gadget references and image (6.1.x)
Update image formatting
LRDOCS-811: Comment out incorrect image and re-number others
LRDOCS-811: Wordsmith
Backported SAML section of User Guie to 6.1.x
LRDOCS-824-6.1.x Backport info on Site Pages -> Advanced -> Page merging, and also some info on adding Site-wide JavaScript to 6.1.x
Merge pull request #726 from jhinkey/6.1.x-LRDOCS-818

LRDOCS-818 Fix section on extending a JSP.
Merge pull request #727 from jhinkey/opensocial-map-ex-6.1.x

Opensocial map example 6.1.x
Merge pull request #732 from jrao/LRDOCS-329-6.1.x

https://issues.liferay.com/browse/LRDOCS-329
Merge pull request #737 from jrao/LRDOCS-824-6.1.x

https://issues.liferay.com/browse/LRDOCS-824