brian 97/06/05 19:49:40
Modified: . index.html
Log:
Obtained from: ken Coar
Remember, do *not* edit files in /export/pub/apache, or if you do,
commit them right after editing them, and only after doing a "cvs
update -Pd ." to make sure you're up to date.
This brings the index.html up to the Apache 1.2 release. Woohoo!
Revision Changes Path
1.21 +10 -2 apache-site/index.html
Index: index.html
===================================================================
RCS file: /export/home/cvs/apache-site/index.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** index.html 1997/06/06 00:22:38 1.20
--- index.html 1997/06/06 02:49:39 1.21
***************
*** 49,58 ****
<HR>
! <H2 ALIGN="CENTER">Apache 1.2b11 Now Available</H2>
<P><BLOCKQUOTE>
The eleventh beta of Apache 1.2 has now been released. The Apache Group
has appreciated the broad testing that previous releases have received
and looks forward to make the general release of 1.2 available. It is
--- 49,65 ----
<HR>
! <H2 ALIGN="CENTER">Apache 1.2 Now Available</H2>
<P><BLOCKQUOTE>
+ <<<<<<< index.html
+ The general release of Apache 1.2 is now available. The Apache Group
+ has appreciated the broad testing that previous beta releases have received
+ and is proud to make the general release of 1.2 available. If you are
+ running any beta of 1.2, or any older version of the Apache HTTP server,
+ you should upgrade to this release for both stability and security
reasons.</BLOCKQUOTE>
+ =======
The eleventh beta of Apache 1.2 has now been released. The Apache Group
has appreciated the broad testing that previous releases have received
and looks forward to make the general release of 1.2 available. It is
***************
*** 60,69 ****
1.2b11 available as the general 1.2 release on June 5th. If you are
running any beta of 1.2, you should upgrade to 1.2b11 for both stability
and security reasons.</BLOCKQUOTE>
<P ALIGN="CENTER">
! <a href="dist/">Download Apache 1.2b11</a> |
<a href="docs/new_features_1_2.html">New Features in Apache 1.2</a>
<P><HR>
--- 67,77 ----
1.2b11 available as the general 1.2 release on June 5th. If you are
running any beta of 1.2, you should upgrade to 1.2b11 for both stability
and security reasons.</BLOCKQUOTE>
+ >>>>>>> 1.20
<P ALIGN="CENTER">
! <a href="dist/">Download Apache 1.2</a> |
<a href="docs/new_features_1_2.html">New Features in Apache 1.2</a>
<P><HR>
