Author: kkolinko Date: Fri Jan 24 15:15:43 2014 New Revision: 1561033 URL: http://svn.apache.org/r1561033 Log: Remove second copy of RUNNING.txt from the full-docs distribution. It is backport of r981845
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/dist.xml tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1561033&r1=1561032&r2=1561033&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 24 15:15:43 2014 @@ -35,12 +35,6 @@ PATCHES PROPOSED TO BACKPORT: +1: markt, kkolinko, rjung -1: -* Remove second copy of RUNNING.txt from the full-docs distribution. - (Backport of r981845) - https://people.apache.org/~kkolinko/patches/2014-01-24_tc6_fulldocs_RUNNING.patch - +1: kkolinko, markt, rjung - -1: - PATCHES/ISSUES THAT ARE STALLED: None Modified: tomcat/tc6.0.x/trunk/dist.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1561033&r1=1561032&r2=1561033&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/dist.xml (original) +++ tomcat/tc6.0.x/trunk/dist.xml Fri Jan 24 15:15:43 2014 @@ -694,7 +694,6 @@ <include name="LICENSE" /> <include name="NOTICE" /> <include name="README.txt" /> - <include name="RUNNING.txt" /> </tarfileset> <tarfileset dir="${tomcat.dist}/webapps/docs" prefix="tomcat-${version.major.minor}-doc"> <include name="**" /> Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1561033&r1=1561032&r2=1561033&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 24 15:15:43 2014 @@ -68,6 +68,11 @@ Align index.html and index.jsp in ROOT web application. Correct links to specifications and to the Tomcat mailing lists. (kkolinko) </fix> + <fix> + Remove second copy of RUNNING.txt from the full-docs distribution. Some + unpacking utilities can't handle multiple copies of a file with the same + name in a directory. (kkolinko) + </fix> </changelog> </subsection> <subsection name="Other"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org