Author: markt
Date: Thu Mar 21 09:56:30 2013
New Revision: 1459209
URL: http://svn.apache.org/r1459209
Log:
Tweak wording
Modified:
tomcat/trunk/SVN-MERGE.txt
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1459209&r1=1459208&r2=1459209&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Thu Mar 21 09:56:30 2013
@@ -23,11 +23,11 @@ ideal. These include:
- potential conflicts if a web application ships with the same JAR
- a large JAR where Tomcat only depends on a small fraction
-There are various approaches taken to dealing with this. Once of those
-approaches is to svn copy the classes to the Tomcat source tree, modify them
-(always a package rename, sometimes additional changes) and then keep them in
-sync with the original via regular svn merges. This file keeps track of these
-copies to assist committers in keeping them up to date.
+There are various approaches taken to dealing with this. One of those
approaches
+is to svn copy the classes to the Tomcat source tree, modify them (always with
a
+package rename, sometimes with additional changes) and then keep them in sync
+with the original via regular svn merges. This file keeps track of these copies
+to assist committers in keeping them up to date.
BCEL
org.apache.tomcat.util.bcel is copied from:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
