You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2013/10/10 11:07:18 UTC

svn commit: r1530884 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/appdev/deployment.xml webapps/docs/changelog.xml

Author: violetagg
Date: Thu Oct 10 09:07:18 2013
New Revision: 1530884

URL: http://svn.apache.org/r1530884
Log:
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.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1530875

Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1530884&r1=1530883&r2=1530884&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Thu Oct 10 09:07:18 2013
@@ -178,7 +178,7 @@ configuration options, such as an access
 configuration and more. This XML file must contain one Context element, which
 will be considered as if it was the child of the Host element corresponding
 to the Host to which the web application is being deployed. The
-<a href="../config/index.html">Tomcat configuration documentation</a> contains
+<a href="../config/context.html">Tomcat configuration documentation</a> contains
 information on the Context element.</p>
 
 </section>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1530884&r1=1530883&r2=1530884&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 10 09:07:18 2013
@@ -135,6 +135,10 @@
         initialization of the servlet org.apache.catalina.manager.StatusManagerServlet
         is removed in the destroy phase. (violetagg)
       </fix>
+      <fix>
+        Correct the documentation for Deployment Organization in the App Dev
+        Guide. (violetagg)
+      </fix>
     </changelog>
   </subsection>
 </section>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org