You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by rd...@apache.org on 2003/05/09 14:58:02 UTC
cvs commit: jakarta-site2/docs .htaccess
rdonkin 2003/05/09 05:58:02
Modified: docs .htaccess
Log:
Removed conflict created when .htaccess file was updated on the server without updating the version in CVS
Revision Changes Path
1.9 +1 -1 jakarta-site2/docs/.htaccess
Index: .htaccess
===================================================================
RCS file: /home/cvs/jakarta-site2/docs/.htaccess,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .htaccess 10 Apr 2003 03:45:20 -0000 1.8
+++ .htaccess 9 May 2003 12:58:02 -0000 1.9
@@ -31,5 +31,5 @@
Redirect Permanent /ant http://ant.apache.org
Redirect Permanent /avalon http://avalon.apache.org
Redirect Permanent /james http://james.apache.org
-Redirect Permanent /turbine/maven(.*) http://maven.apache.org$1
+RedirectMatch Permanent /turbine/maven(.*) http://maven.apache.org$1
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: site-cvs-help@jakarta.apache.org