LRDOCS-777 Updated GlassFish section of the Installation chapter of User Guide to use Liferay 6.2 and GlassFish 4.0, except for the manual JNDI database connection setup section
LRDOCS-777 Updated screenshots and text of the GlassFish JDBC connection pool configuration section of the Installation chapter
Remove WebLogic 10 instructions as WebLogic 10 not supported. Note, version 10.3 is still supported.
LRDOCS-774 Add WebLogic 12c install instructions
Remove WebLogic 10.3 for now.
15-installation- Replace special char
Updated section in User Guide on the sample drools portlet's default configuration, added screenshot
Removed reference to the rules_user_custom_attribute_content.drl file that contains rules that don't work on Liferay 6.2. The rules need to be updated to be made compatible with API changes. See fix for LPS-40820 to see how this should be done.
Updated User Guide's section on the Sample Drools EE portlet, updated code examples and explanations, using Mike Han's September, 2013 fix
Merge branch 'master' into weblogic-12c
LRDOCS-774 WebLogic - mention XA. Remove WLS images.
LRDOCS-777 Updated GlassFish installation instructions to include edits to server.policy and to include an instruction to restart GlassFish after deploying Liferay via the GlassFish admin console
LRDOCS-777 Clarified instructions regarding the GlassFish-managed database connection pool setup and using or disabling the portal setup wizard
LRDOCS-777
LRDOCS-774 Add more to WebLogic 12c install instructions, including enabling Java Security.
Merge pull request #673 from jrao/LRDOCS-777

https://issues.liferay.com/browse/LRDOCS-777
Merge pull request #674 from jhinkey/weblogic-12c

Weblogic 12c install
Merge pull request #675 from jrao/drools-ee-update

Updated User Guide's explanation of the Sample Drools portlet
Minor wordsmithing and updating to 6.2.
Merge branch 'master' into websphere

Conflicts:
	userGuide/en/chapters/15-installation-and-setup.markdown