CTR: docs
Improve documentation of the Manager application:

Merged revision 1643642 from tomcat/tc7.0.x/trunk:
(revision 1641726 from tomcat/tc8.0.x/trunk,
revisions r1641707 and r1641718 from tomcat/trunk).

r1641707: Wrap parameters that are common to all commands into a "Common Parameters" subsection.
r1641718: Arrange description of variants of Deploy command as subsections.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1643646 13f79535-47bb-0310-9956-ffa450edef68
CTR: docs
Document /expire command.
There are two differences versus Tomcat 7:
a) The command is called as /manager/expire instead of /manager/text/expire
b) The last line of output is different (from r1614165)

Merged revision 1643647 from tomcat/tc7.0.x/trunk
(r1641729 from tomcat/tc8.0.x/trunk, r1641721 from tomcat/trunk).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1643648 13f79535-47bb-0310-9956-ffa450edef68