LRDOCS-760: Bookmarks re-org and updates for 6.2
LRDOCS-674: Update deprecated portlets and instruct how to activate them
LRDOCS-726 Clarified some instructions in the Drools EE section of the User Guide
LRDOCS-696 Updated information on setting the legacy password encryption algorithm when upgrading from Liferay 6.1 to Liferay 6.2
LRDOCS-760: Software Catalog, Shopping, and Amazon Ranking updates for 6.2
LRDOCS-711 Added section on JBoss 7's standalone mode vs domain mode, explained that standalone is fully support while domain mode is not; in particular, JBoss 7 in domain mode does not support deploying non-exploded .war files
LRDOCS-760: Added notes and reference tix for Reports and Knowledge Base updating
LRDOCS-760: Image numbering
LRDOCS-696 Added note that the 6.2 default encryption algorithm is a stronger algorithm than the 6.1 default
LRDOCS-696 Updated and reorganized information on upgrading to Liferay 6.2 from previous versions
Merge branch 'LRDOCS-746' of github.com:jrao/liferay-docs into encryption
LRDOCS-763 Updated Cache Settings section with information from Mike Han on various cache configuration settings
LRDOCS-726 Fixed tiny merge conflict (formatting)
LRDOCS-754: Refer to new Twitter gadget URL
Update OpenSocial Gadget Editor image
Wordsmithed, commented, and added diagram.
Merge pull request #654 from jrao/LRDOCS-726

http://issues.liferay.com/browse/LRDOCS-726
Merge branch 'LRDOCS-711' of github.com:jrao/liferay-docs into jboss
Wordsmithing.
Merge branch 'master' of github.com:sez11a/liferay-docs