Hi,

https://svn.apache.org/repos/asf/perl/modperl/docs/trunk/httpd.conf

and

https://snv.apache.org/repos/asf/infrastructure/trunk/httpd-conf/www.apache.org/vhosts/perl.apache.org.conf

are grossly out of sync.  I don't feel comfortable just syncing them, can I 
have some other eyes ?



-- 
------------------------------------------------------------------------
Philip M. Gollucci ([EMAIL PROTECTED]) 323.219.4708
Consultant / http://p6m7g8.net/Resume/resume.shtml
Senior Software Engineer - TicketMaster - http://ticketmaster.com
1024D/A79997FA F357 0FDD 2301 6296 690F  6A47 D55A 7172 A799 97F

"It takes a minute to have a crush on someone, an hour to like someone,
and a day to love someone, but it takes a lifetime to forget someone..."
Index: httpd.conf
===================================================================
--- httpd.conf  (revision 419707)
+++ httpd.conf  (working copy)
@@ -1,116 +1,102 @@
-# this file is actually included in the main httpd.conf at
-# www.apache.org, in order to make sure that *we* don't lose that
-# data, it's also stored in this file. Whenever modifying the main
-# file make sure to first change this file, so the changes won't get
-# lost.
+<VirtualHost *:80>
+   DocumentRoot /x1/www/perl.apache.org
+   ServerName perl.apache.org
+   ServerAlias apache.perl.org perl-new.apache.org perl.*.apache.org
+   XBithack Full
+   Redirect permanent /from-cvs/ http://cvs.apache.org/snapshots/
+   # Documentation included in the old site.
+   Redirect permanent /guide http://perl.apache.org/docs/1.0/guide
+   # Distributed with mod_perl
+   Redirect permanent /src/mod_perl.html http://perl.apache.org/docs/index.html
+   Redirect permanent /src/apache-modlist.html 
http://perl.apache.org/products/apache-modules.html
+   Redirect permanent /src/cgi_to_mod_perl.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /src/mod_perl_traps.html 
http://perl.apache.org/docs/index.html
+   # (equivalent to those with /src above, but it seems like the dist is kept 
symlinked in 2 locations)
+   Redirect permanent /dist/mod_perl.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /dist/apache-modlist.html 
http://perl.apache.org/products/apache-modules.html
+   Redirect permanent /dist/cgi_to_mod_perl.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /dist/mod_perl_traps.html 
http://perl.apache.org/docs/index.html
 
-# This is actually a section within the perl.apache.org named virtual
-# host.
+   # FAQs
+   Redirect permanent /faq/mod_perl_cgi.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /mod_perl_cvs.html 
http://perl.apache.org/contribute/svn_howto.html
+   Redirect permanent /faq/index.html http://perl.apache.org/docs/index.html
+   Redirect permanent /tuning/index.html http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_api.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /features/tmpl-cmp.html 
http://perl.apache.org/docs/tutorials/tmpl/comparison/comparison.html
+   Redirect permanent /perl_myth.html 
http://perl.apache.org/docs/general/perl_myth.html
+   Redirect permanent /perl_myth.pod 
http://perl.apache.org/docs/general/perl_myth.pod.orig
+   Redirect permanent /faq/mjtg-news.txt http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_api.pod 
http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_cgi.pod 
http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_faq.html 
http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_faq.pod 
http://perl.apache.org/docs/index.html
+   Redirect permanent /faq/mod_perl_faq.tar.gz 
http://perl.apache.org/docs/index.html
+   Redirect permanent /distributions.html 
http://perl.apache.org/download/index.html
+   Redirect permanent /tidbits.html 
http://perl.apache.org/docs/offsite/articles.html
+   Redirect permanent /products.html http://perl.apache.org/products/index.html
+   Redirect permanent /isp.html http://perl.apache.org/help/isps.html
+   Redirect permanent /sites.html http://perl.apache.org/outstanding/sites.html
 
-DocumentRoot /www/perl.apache.org/
-ServerName perl.apache.org
-ServerAlias apache.perl.org
-XBithack Full
-Redirect permanent /from-cvs/ http://cvs.apache.org/snapshots/
+   # Stories
+   Redirect permanent /stories/index.html 
http://perl.apache.org/outstanding/success_stories/index.html
+   Redirect permanent /stories/ColbyChem.html 
http://perl.apache.org/outstanding/success_stories/colbychem.html
+   Redirect permanent /stories/France-Presse.html 
http://perl.apache.org/outstanding/success_stories/www.afp-direct.com.html
+   Redirect permanent /stories/adultad.html 
http://perl.apache.org/outstanding/success_stories/adultad.html
+   Redirect permanent /stories/bsat.html 
http://perl.apache.org/outstanding/success_stories/bsat.html
+   Redirect permanent /stories/idl-net.html 
http://perl.apache.org/outstanding/success_stories/idl-net.html
+   Redirect permanent /stories/imdb.html 
http://perl.apache.org/outstanding/success_stories/imdb.com.html
+   Redirect permanent /stories/lind-waldock.html 
http://perl.apache.org/outstanding/success_stories/www.lind-waldock.com.html
+   Redirect permanent /stories/presto.html 
http://perl.apache.org/outstanding/success_stories/presto.html
+   Redirect permanent /stories/seds-org.html 
http://perl.apache.org/outstanding/success_stories/seds.org.html
+   Redirect permanent /stories/singlesheaven.html 
http://perl.apache.org/outstanding/success_stories/singlesheaven.com.html
+   Redirect permanent /stories/tgix.html 
http://perl.apache.org/outstanding/success_stories/tgix.html
+   Redirect permanent /stories/uber-alles.html 
http://perl.apache.org/outstanding/success_stories/openscape.org.html
+   Redirect permanent /stories/webby.html 
http://perl.apache.org/outstanding/success_stories/imdb.com.html
+   Redirect permanent /stories/winamillion.html 
http://perl.apache.org/outstanding/success_stories/winamillion.msn.com.html
+   Redirect permanent /stories/wmboerse.html 
http://perl.apache.org/outstanding/success_stories/wmboerse.html
 
-ErrorDocument 404 /404.html
+   # Win32 docs
+   Redirect permanent /win32_binaries.html 
http://perl.apache.org/docs/1.0/os/win32/index.html
+   Redirect permanent /win32_binaries.pod 
http://perl.apache.org/docs/1.0/os/win32/index.html
+   Redirect permanent /win32_compile.html 
http://perl.apache.org/docs/1.0/os/win32/index.html
+   Redirect permanent /win32_compile.pod 
http://perl.apache.org/docs/1.0/os/win32/index.html
+   Redirect permanent /win32_multithread.html 
http://perl.apache.org/docs/1.0/os/win32/multithread.html
+   Redirect permanent /win32_multithread.pod 
http://perl.apache.org/docs/1.0/win32/multithread.pod.orig
 
-AddType text/plain .pod
-AddType text/plain .orig
-AddType text/plain .txt
+   # E-mail etiquette
+   Redirect permanent /email-etiquette.html 
http://perl.apache.org/maillist/email-etiquette.html
 
-### URI remapping ###
+   # Jobs
+   Redirect permanent /jobs.html http://perl.apache.org/jobs/jobs.html
 
-# Documentation included in the old site.
-Redirect permanent /guide http://perl.apache.org/docs/1.0/guide
+   # Stats
+   Redirect permanent /netcraft/index.html 
http://perl.apache.org/outstanding/stats/netcraft.html
 
-# Distributed with mod_perl
-Redirect permanent /src/mod_perl.html http://perl.apache.org/docs/index.html
-Redirect permanent /src/apache-modlist.html 
http://perl.apache.org/products/apache-modules.html
-Redirect permanent /src/cgi_to_mod_perl.html 
http://perl.apache.org/docs/index.html
-Redirect permanent /src/mod_perl_traps.html 
http://perl.apache.org/docs/index.html
-# (equivalent to those with /src above, but it seems like the dist is kept 
symlinked in 2 locations)
-Redirect permanent /dist/mod_perl.html http://perl.apache.org/docs/index.html
-Redirect permanent /dist/apache-modlist.html 
http://perl.apache.org/products/apache-modules.html
-Redirect permanent /dist/cgi_to_mod_perl.html 
http://perl.apache.org/docs/index.html
-Redirect permanent /dist/mod_perl_traps.html 
http://perl.apache.org/docs/index.html
+   # Old logos
+   Redirect permanent /logos/index.html 
http://perl.apache.org/about/link/linktous.html
 
-# FAQs
-Redirect permanent /faq/mod_perl_cgi.html 
http://perl.apache.org/docs/index.html
-Redirect permanent /mod_perl_cvs.html 
http://perl.apache.org/contribute/cvs_howto.html
-Redirect permanent /faq/index.html http://perl.apache.org/docs/index.html
-Redirect permanent /tuning/index.html http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_api.html 
http://perl.apache.org/docs/index.html
-Redirect permanent /features/tmpl-cmp.html 
http://perl.apache.org/docs/tutorials/tmpl/comparison/comparison.html
-Redirect permanent /perl_myth.html 
http://perl.apache.org/docs/general/perl_myth.html
-Redirect permanent /perl_myth.pod 
http://perl.apache.org/docs/general/perl_myth.pod.orig
-Redirect permanent /faq/mjtg-news.txt http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_api.pod http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_cgi.pod http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_faq.html 
http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_faq.pod http://perl.apache.org/docs/index.html
-Redirect permanent /faq/mod_perl_faq.tar.gz 
http://perl.apache.org/docs/index.html
+   # embperl
+   Redirect permanent /Embperl/ http://perl.apache.org/embperl/
+   Redirect permanent /perl/Embperl/ http://perl.apache.org/embperl/
+   Redirect permanent /embperl.html http://perl.apache.org/embperl/
 
-Redirect permanent /distributions.html 
http://perl.apache.org/download/index.html
-Redirect permanent /tidbits.html 
http://perl.apache.org/docs/offsite/articles.html
-Redirect permanent /products.html http://perl.apache.org/products/index.html
-Redirect permanent /isp.html http://perl.apache.org/help/isps.html
-Redirect permanent /sites.html http://perl.apache.org/outstanding/sites.html
+   # ASP
+   Redirect permanent /asp http://www.apache-asp.org/
 
-# Stories
-Redirect permanent /stories/index.html 
http://perl.apache.org/outstanding/success_stories/index.html
-Redirect permanent /stories/ColbyChem.html 
http://perl.apache.org/outstanding/success_stories/colbychem.html
-Redirect permanent /stories/France-Presse.html 
http://perl.apache.org/outstanding/success_stories/www.afp-direct.com.html
-Redirect permanent /stories/adultad.html 
http://perl.apache.org/outstanding/success_stories/adultad.html
-Redirect permanent /stories/bsat.html 
http://perl.apache.org/outstanding/success_stories/bsat.html
-Redirect permanent /stories/idl-net.html 
http://perl.apache.org/outstanding/success_stories/idl-net.html
-Redirect permanent /stories/imdb.html 
http://perl.apache.org/outstanding/success_stories/imdb.com.html
-Redirect permanent /stories/lind-waldock.html 
http://perl.apache.org/outstanding/success_stories/www.lind-waldock.com.html
-Redirect permanent /stories/presto.html 
http://perl.apache.org/outstanding/success_stories/presto.html
-Redirect permanent /stories/seds-org.html 
http://perl.apache.org/outstanding/success_stories/seds.org.html
-Redirect permanent /stories/singlesheaven.html 
http://perl.apache.org/outstanding/success_stories/singlesheaven.com.html
-Redirect permanent /stories/tgix.html 
http://perl.apache.org/outstanding/success_stories/tgix.html
-Redirect permanent /stories/uber-alles.html 
http://perl.apache.org/outstanding/success_stories/openscape.org.html
-Redirect permanent /stories/webby.html 
http://perl.apache.org/outstanding/success_stories/imdb.com.html
-Redirect permanent /stories/winamillion.html 
http://perl.apache.org/outstanding/success_stories/winamillion.msn.com.html
-Redirect permanent /stories/wmboerse.html 
http://perl.apache.org/outstanding/success_stories/wmboerse.html
+   # Contributors
+   Redirect permanent /CREDITS.html 
http://perl.apache.org/about/contributors/people.html
 
-# Win32 docs
-Redirect permanent /win32_binaries.html 
http://perl.apache.org/docs/1.0/os/win32/index.html
-Redirect permanent /win32_binaries.pod 
http://perl.apache.org/docs/1.0/os/win32/index.html
-Redirect permanent /win32_compile.html 
http://perl.apache.org/docs/1.0/os/win32/index.html
-Redirect permanent /win32_compile.pod 
http://perl.apache.org/docs/1.0/os/win32/index.html
-Redirect permanent /win32_multithread.html 
http://perl.apache.org/docs/1.0/os/win32/multithread.html
-Redirect permanent /win32_multithread.pod 
http://perl.apache.org/docs/1.0/win32/multithread.pod.orig
+   # Contribute
+   Redirect permanent /contribute/cvs_howto.html 
http://perl.apache.org/about/contribute/svn_howto.html
 
-# E-mail etiquette
-Redirect permanent /email-etiquette.html 
http://perl.apache.org/maillist/email-etiquette.html
+   # Misc
+   Redirect permanent /bench.txt http://www.chamas.com/bench/
+   Redirect permanent /email-etiquette.pod 
http://perl.apache.org/maillist/email-etiquette.pod.orig
+   Redirect permanent /embperl.html http://perl.apache.org/embperl/
+   Redirect permanent /faqs.html http://perl.apache.org/docs/offsite/index.html
 
-# Jobs
-Redirect permanent /jobs.html http://perl.apache.org/jobs/jobs.html
 
-# Stats
-Redirect permanent /netcraft/index.html 
http://perl.apache.org/outstanding/stats/netcraft.html
-
-# Old logos
-Redirect permanent /logos/index.html 
http://perl.apache.org/about/link/linktous.html
-
-# embperl
-Redirect permanent /Embperl/ http://perl.apache.org/embperl/
-Redirect permanent /perl/Embperl/ http://perl.apache.org/embperl/
-Redirect permanent /embperl.html http://perl.apache.org/embperl/
-
-# ASP
-Redirect permanent /asp http://www.apache-asp.org/
-
-# Contributors
-Redirect permanent /CREDITS.html 
http://perl.apache.org/about/contributors/people.html
-
-# Contribute
-Redirect permanent /contribute/cvs_howto.html 
http://perl.apache.org/about/contribute/svn_howto.html
-
-# Misc
-Redirect permanent /bench.txt http://www.chamas.com/bench/
-Redirect permanent /email-etiquette.pod 
http://perl.apache.org/maillist/email-etiquette.pod.orig
-Redirect permanent /embperl.html http://perl.apache.org/embperl/
-Redirect permanent /faqs.html http://perl.apache.org/docs/offsite/index.html
+   RewriteEngine On
+   RewriteOptions inherit
+</VirtualHost>

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to