Merged revision 1530875 from tomcat/trunk: The link under Tomcat Context Descriptor section should point to documentation about context.xml and not the one for server.xml. Issue is reported via o.a.comments.