sez11a/liferay-docs — pull request #289 by jrao (2012-08-16 15:35:05+00:00)
Title: http://issues.liferay.com/browse/LRDOCS-269

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

added clarification that the LDAP settings in the DB get merged with the settings in portal.properties; settings in the DB take precedence in case of conflict