LRDOCS-585: Update Site Templates section for 6.2
LRDOCS-586: Update Page Templates section for 6.2
Merge branch 'master' into adv-web-content-management
LRDOCS-686: WAP technology deprecated
LRDOCS-686: WAP Styling deprecated for portlet's Look and Feel
LRDOCS-620 Added documentation of the calendar portlet's export/import functionality for calendar events and resources
LRDOCS-624 Added information about the friendly URL to calendar events that's included in event invitation notification emails; this is useful because it allows users easy access to events' views in the calendar portlet so they can respond to event invitations
Merge pull request #589 from codyhoag/adv-web-content-management

Site and Page Templates for 6.2
Merge pull request #591 from codyhoag/wcm-6.2

WAP technology deprecation
Merge pull request #592 from jrao/LRDOCS-317

http://issues.liferay.com/browse/LRDOCS-620
LRDOCS-590: Images for portlets' Look and Feel
LRDOCS-591: Export/Import section update for 6.2
LRDOCS-563 Added coverage of the Directory Indexing Enabled option in Site Settings
LRDOCS-521 Added warning about LPS-35317, added tip that it's generally best to enabled staging for a site as early as possible before the CMS has gigabytes of data stored in it
LRDOCS-604
Added note about the subscribe option for Documents and Media folders
LRDOCS-630 Added section to Liferay utility applications chapter on the Akismet spam protection app
Portlet configuration options and recycle bin updates for 6.2
Merge pull request #594 from jrao/LRDOCS-563

http://issues.liferay.com/browse/LRDOCS-563
Merge pull request #595 from codyhoag/look-and-feel

Look and Feel images and Export/Import section

I merged this in and left LRDOCS-594 open. I also linked that ticket to LPS-38624 and gave that ticket a priority of 5, so the PMs will see it.
Merge pull request #596 from jrao/LRDOCS-521

http://issues.liferay.com/browse/LRDOCS-521