httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-site httpd.html
Date Thu, 30 Mar 2000 21:44:48 GMT
rbb         00/03/30 13:44:48

  Modified:    .        httpd.html
  Log:
  Back out some unintended changes to the front page of the web server
  site.
  
  Revision  Changes    Path
  1.92      +0 -23     apache-site/httpd.html
  
  Index: httpd.html
  ===================================================================
  RCS file: /home/cvs/apache-site/httpd.html,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- httpd.html	2000/03/30 21:34:04	1.91
  +++ httpd.html	2000/03/30 21:44:47	1.92
  @@ -62,7 +62,6 @@
   
   <P><HR>
   
  -<<<<<<< httpd.html
   <H2 ALIGN="CENTER">Apache 2.0 Alpha Now Available!</H2>
   
   <P><BLOCKQUOTE>
  @@ -78,27 +77,6 @@
   Apache 1.3.12 instead. Please <a href="bug_report.html">report any bugs</a>
you
   find.
   
  -<A HREF="dist/">Download Apache 2.0a1</A> | 
  -<A HREF="docs/new_features_2_0.html">New Features in Apache 2.0</A>
  -
  -</BLOCKQUOTE>
  -
  -=======
  -<H2 ALIGN="CENTER">Apache 2.0 Alpha Now Available!</H2>
  -
  -<P><BLOCKQUOTE>
  -
  -Apache 2.0a1 is a public alpha of the forthcoming Apache 2.0, an update
  -which includes several new enhancements, including the new Apache Portable
  -Run-time and the new Multi-processing modules.  This is an alpha release, 
  -and is for experimental purposes; use at your own risk. It is available 
  -in source format only, so a compiler is neccessary to use it 
  -
  -<p>If you are not familiar with software development, and wish to use
  -a stable, working, web server, we strongly reccomend you download
  -Apache 1.3.12 instead. Please <a href="bug_report.html">report any bugs</a>
you
  -find.
  -
   </BLOCKQUOTE>
   
   <P ALIGN="CENTER">
  @@ -106,7 +84,6 @@
   <A HREF="docs/new_features_2_0.html">New Features in Apache 2.0</A>
   <P><HR>
   
  ->>>>>>> 1.88
   <H2 ALIGN="CENTER">Apache 1.3.12 Now Available</H2>
   
   <P><BLOCKQUOTE>
  
  
  

Mime
View raw message