Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE282C0FD for ; Thu, 7 Jun 2012 21:16:47 +0000 (UTC) Received: (qmail 84676 invoked by uid 500); 7 Jun 2012 21:16:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 84539 invoked by uid 500); 7 Jun 2012 21:16:47 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 84529 invoked by uid 99); 7 Jun 2012 21:16:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 21:16:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 21:16:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 19820238896F for ; Thu, 7 Jun 2012 21:16:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1347801 - in /tomcat/site/trunk: ./ jk-xdocs/ jk-xdocs/ajp/ jk-xdocs/generic_howto/ jk-xdocs/images/ jk-xdocs/jk2/ jk-xdocs/miscellaneous/ jk-xdocs/news/ jk-xdocs/reference/ jk-xdocs/webserver_howto/ native-1.1-xdocs/ native-1.1-xdocs/imag... Date: Thu, 07 Jun 2012 21:16:22 -0000 To: dev@tomcat.apache.org From: kkolinko@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120607211623.19820238896F@eris.apache.org> Author: kkolinko Date: Thu Jun 7 21:16:21 2012 New Revision: 1347801 URL: http://svn.apache.org/viewvc?rev=1347801&view=rev Log: Add empty copies of jk/trunk/xdocs and native/branches/1.1.x/xdocs. Let's keep them empty. I set svn:ignore=* on them. Update instructions. Added: tomcat/site/trunk/jk-xdocs/ (props changed) - copied from r1347785, tomcat/jk/trunk/xdocs/ tomcat/site/trunk/native-1.1-xdocs/ (props changed) - copied from r1347785, tomcat/native/branches/1.1.x/xdocs/ Removed: tomcat/site/trunk/jk-xdocs/ajp/ tomcat/site/trunk/jk-xdocs/build.xml tomcat/site/trunk/jk-xdocs/empty.xml tomcat/site/trunk/jk-xdocs/generic_howto/ tomcat/site/trunk/jk-xdocs/images/ tomcat/site/trunk/jk-xdocs/index.xml tomcat/site/trunk/jk-xdocs/jk2/ tomcat/site/trunk/jk-xdocs/miscellaneous/ tomcat/site/trunk/jk-xdocs/news/ tomcat/site/trunk/jk-xdocs/project.xml tomcat/site/trunk/jk-xdocs/reference/ tomcat/site/trunk/jk-xdocs/style.css tomcat/site/trunk/jk-xdocs/style.xsl tomcat/site/trunk/jk-xdocs/webserver_howto/ tomcat/site/trunk/native-1.1-xdocs/build.xml tomcat/site/trunk/native-1.1-xdocs/images/ tomcat/site/trunk/native-1.1-xdocs/index.xml tomcat/site/trunk/native-1.1-xdocs/miscellaneous/ tomcat/site/trunk/native-1.1-xdocs/news/ tomcat/site/trunk/native-1.1-xdocs/project.xml tomcat/site/trunk/native-1.1-xdocs/style.css tomcat/site/trunk/native-1.1-xdocs/style.xsl Modified: tomcat/site/trunk/README.txt tomcat/site/trunk/build.xml Modified: tomcat/site/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1347801&r1=1347800&r2=1347801&view=diff ============================================================================== --- tomcat/site/trunk/README.txt (original) +++ tomcat/site/trunk/README.txt Thu Jun 7 21:16:21 2012 @@ -82,11 +82,27 @@ To update the documentation for Tomcat 5 To update the documentation for Tomcat Native or Tomcat Connectors: ==================================================================== -1. Update the svn-external for tomcat-site to point to the correct revision. - This *must* match the tag for the latest released version. -2. cd into your tomcat-site directory and execute: +One way to update documentation is to: + + - Build it in those projects, e.g. as a part of release process, + and to replace docs/native-doc or docs/connectors-doc with the docs + that you have built. + +Another way is to call the bring the sources into this project and build +them here. + +For the latter: + +1. Use "svn switch" command to switch jk-xdocs or native-1.1-xdocs + directories to xdocs directory of trunk or tag in those projects. + + + Or just copy "xdocs" directory from source distributive of released + version. + +2. cd into your tomcat-site directory and execute one of the following +commands: - svn up ant release-native ant release-jk Modified: tomcat/site/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1347801&r1=1347800&r2=1347801&view=diff ============================================================================== --- tomcat/site/trunk/build.xml (original) +++ tomcat/site/trunk/build.xml Thu Jun 7 21:16:21 2012 @@ -160,7 +160,7 @@ - + Propchange: tomcat/site/trunk/jk-xdocs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 7 21:16:21 2012 @@ -0,0 +1 @@ +* Propchange: tomcat/site/trunk/native-1.1-xdocs/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Jun 7 21:16:21 2012 @@ -0,0 +1 @@ +* --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org