===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/29.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- www/29.html	2001/04/29 20:22:42	1.13
+++ www/29.html	2001/04/30 21:59:35	1.14
@@ -98,10 +98,18 @@
 <li>The system includes the following major components from outside suppliers:
 <p>
 <ul>
+<<<<<<< 29.html
+<li>XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support
+for all chipsets)
+<li>gcc 2.95.3 (+ patches)
+<li>perl 5.6.0 plus a few fixes.
+<li>Apache 1.3.19 (+ patches), mod_ssl 2.8.1, OpenSSL 0.9.5a, DSO support
+=======
 <li>XFree86 4.0.3 (and i386 contains 3.3.X servers also, thus providing support for all chipsets)
 <li>gcc 2.95.3 (+ patches)
 <li>perl 5.6.0 (+ patches)
 <li>Apache 1.3.19, mod_ssl 2.8.2, OpenSSL 0.9.6 (+ patches), DSO support
+>>>>>>> 1.13
 <li>ipf 3.4.16 (+ patches)
 <li>groff 1.15
 <li>sendmail 8.11.3
@@ -348,35 +356,30 @@
 Rather, it is a set of notes meant to kickstart the user on the
 OpenBSD ports system.
 <p>
-Certainly, the OpenBSD ports system is not complete.  This is because
-the full integration of ports into the OpenBSD environment is still a
-young project as of this release.  We believe the ports that are
-provided here are stable, but it is most important to realize that
-ports will continue to grow a great deal in functionality in the
-future.
+Certainly, the OpenBSD ports system is not complete.  It is doubtful it
+will ever be. However, it is growing very fast and getting more stable.
+Almost all ports provided with this release should build without problems
+on most architectures (over 1200 packages build on i386, for instance).
 <p>
-As we said, ports will be growing a lot in the future.  The <i>ports/</i>
-directory represents a CVS (see the manpage for cvs(1) if you aren't
-familiar with CVS) checkout of our ports.  As with our complete source
-tree, our ports tree is available via anoncvs.  So, in
+The <i>ports/</i> directory represents a CVS (see the manpage for cvs(1) if 
+you aren't familiar with CVS) checkout of our ports.  As with our complete 
+source tree, our ports tree is available via anoncvs.  So, in
 order to keep current with it, you must make the <i>ports/</i> tree
 available on a read-write medium and update the tree with a command
 like:
 <p>
 <ul><pre>
-# <strong>cd [portsdir]/; cvs -d anoncvsserver.openbsd.org:/cvs update -PAd</strong>
+# <strong>cd [portsdir]/; cvs -d anoncvsserver.openbsd.org:/cvs update -Pd -rOPENBSD_2_9</strong>
 </pre></ul>
 <p>
 [Of course, you must replace the local directory and server name here
 with the location of your ports collection and a nearby anoncvs
 server.]
 <p>
-Again, it is important to see the webpage for specific instructions as
-this is a new service which hasn't yet been ironed out
-completely.
+Note that most ports are available as packages through ftp. Updated
+packages for the 2.9 release will be made available if problems arise.
 <p>
-Finally, despite ports' youth, help is never far.  If you're
-interested in seeing a port added, would like to help out, or just
+If you're interested in seeing a port added, would like to help out, or just
 would like to know more, the mailing list ports@openbsd.org is a good
 place to know.
 <p>
@@ -384,7 +387,7 @@
 <hr>
 <a href="index.html"><img height=24 width=24 src=back.gif border=0 alt=OpenBSD></a> 
 <a href=mailto:www@openbsd.org>www@openbsd.org</a>
-<br><small>$OpenBSD: 29.html,v 1.13 2001/04/29 20:22:42 chris Exp $</small>
+<br><small>$OpenBSD: 29.html,v 1.14 2001/04/30 21:59:35 espie Exp $</small>
 
 </body>
 </html>