Merge branch 'dev-guide-03-portlets-6.2' into trunk-dev-guide
devGuide - portlets Update image number
devGuide - portlets - Fix resource bundle XML.
devGuide - portlets - Fix resource bundle XML and mention mavenizing the bundle.
Merge branch 'LRDOCS-745' into trunk-dev-guide
LRDOCS-750 Added brief introduction to the Control Panel in ch2 since creating sites requires accessing the Control Panel. Added tip explaining that the site administration tools have been removed from the Control Panel.
LRDOCS-809: Fix incorrect nesting of User Guide chapter
Dev Guide - frameworks - Edit JSON Web Service section.
LRDOCS-742: Update gadget URLs, minor edits, and image updates for 6.2
LRDOCS-742: Update Gadget Editor content for 6.2
LRDOCS-742: Renumbered images and added comments
LRDOCS-650 Explained that's it's necessary to enable the tunneling servlet auth verifier and to set up a shared authentication key in order to set up remote staging
LRDOCS-650 Explained that using a pre-shared key for remote staging web service authentication eliminates the need to send the publishing user's password to the remote server; if the pre-shared keys match, Liferay creates an authentication context (permission checker) based on the user's email address, screen name, or user ID
LRDOCS-742: Mention PubSub deprecation for Google gadgets and note "in progress" status for outdated Google API example references
LRDOCS-564 Added section on Liferay out-of-the-box roles, emphasized the difference between site/organization administrators and site/organization owners
Updated note about organization/site administrator/owner roles, fixed some typos
Merge branch 'master' into trunk-dev-guide
Merge branch 'opensocial-dev-guide2' of https://github.com/codyhoag/liferay-docs into opensocial-dev-guide2
LRDOCS-796: Gave more detail on viewing web content using "View in Context" option
LRDOCS-670 Explained that Liferay renames imported friendly URLs, friendly URL translations, and category names if importing a LAR file into a site causes a friendly URL, friendly URL translation, or category name collision