DERBY-6379 Manuals are inconsistent in their use of the <shortdesc> element Merged DERBY-6379-devguide.diff to 10.10 doc branch from trunk revision 1541073.