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

http://issues.liferay.com/browse/LRDOCS-388

LRDOCS-388 Backport from 6.2.x to 6.1.x