DERBY-6379 Manuals are inconsistent in their use of the <shortdesc> element Merged DERBY-6379-adminconcepts.diff (except for 4 files for which I will file another patch) to 10.10 doc branch from trunk revision 1540771.