4 files changed, 45 insertions, 67 deletions

diff --git a/release/texts/ERRATA.TXT b/release/texts/ERRATA.TXT
index cd4461ebc7ec..c50a0b061fda 100644
--- a/release/texts/ERRATA.TXT
+++ b/release/texts/ERRATA.TXT
@@ -24,7 +24,7 @@ For the latest security incident information.
 
 ---- Security Advisories:
 
-Current active security advisories for 3.4:
+Current active security advisories for 3.5:
 
 ---- System Update Information:
 
diff --git a/release/texts/README.TXT b/release/texts/README.TXT
index 7c43e2eb8906..8dd5f64371aa 100644
--- a/release/texts/README.TXT
+++ b/release/texts/README.TXT
@@ -1,11 +1,11 @@
    -----------------------------------------
-       FreeBSD 3.4  ---  RELEASE Version               ,        ,
+       FreeBSD 3.5  ---  RELEASE Version               ,        ,
    -----------------------------------------          /(        )`
                                                       \ \___   / |
-This is a full release of FreeBSD, 3.4-RELEASE,       /- _  `-/  '
+This is a full release of FreeBSD, 3.5-RELEASE,       /- _  `-/  '
 from the 3.0-STABLE branch of the FreeBSD CVS        (/\/ \ \   /\
 repository.  This is the follow-on release to        / /   | `    \
-FreeBSD 3.3-RELEASE, more information being          O O   ) /    |
+FreeBSD 3.4-RELEASE, more information being          O O   ) /    |
 available in RELNOTES.TXT                            `-^--'`<     '
                                                     (_.)  _  )   /
                                                      `.___/`    /
@@ -19,24 +19,10 @@ ABOUT.TXT file for more information.                    \       /       /\
                                                  ,'  ,-----'   |
                                                  `--{__________)
 
-TARGET AUDIENCE:
-----------------
-This release is aimed primarily at early-adopters and the various
-other folks who want to get involved with the ongoing development
-of FreeBSD and are willing to deal with a few bumps in the road.
-We do our best to ensure that each snapshot works as advertised,
-but tracking -current is a process which frequently has its off
-days.
-
-If you're both technically proficient and know exactly what you're
-getting into here (e.g. you've been following -current) then this
-snapshot is probably for you.  If you're more interested in doing
-business with FreeBSD than in playing with the cutting edge of
-technology, however, then 3.x is almost certainly your best bet.
-
-
-Most information here is also available from the Documentation menu
-during installation.
+***********************************************************************
+* Most information here is also available from the Documentation menu *
+* during installation.                                                *
+***********************************************************************
 
   ERRATA.TXT    Read this file!  It will tell you where to look for the
                 latest information on problems which have been found and
@@ -70,31 +56,29 @@ o It is, again, very important to check the ERRATA.TXT file for any
   been reported (and fixed as noted in the ERRATA).
 
 
-If you're a developer/hobbiest and not interested in QA'd releases
-so much as simply keeping up to date on the latest FreeBSD technology,
-you can also install one of our "snapshot" releases.
+For the most up-to-date software along the RELENG_3 branch (also known
+as 3.5-stable), please track that branch in the CVS repository using
+CVSup, CTM, AnonCVS, etc. (see http://www.freebsd.org/handbook/synching.html
+for more information).
 
-For the most up-to-date software along the RELENG_3 branch
-(also known as 3.4-stable), now proceeding towards the release
-of FreeBSD 3.5, please install your snapshots from from:
+For the latest 4.0-STABLE (RELENG_4 branch) snapshot releases, please
+install from:
 
-        ftp://releng3.freebsd.org/pub/FreeBSD/
+        ftp://releng4.freebsd.org/pub/FreeBSD
 
-For the latest 4.0-current (HEAD branch) snapshot releases,
-please install from:
+For the latest 5.0-CURRENT (HEAD branch) snapshot releases, please
+install from:
 
         ftp://current.freebsd.org/pub/FreeBSD
 
-If you plan to run either -Stable or -Current you MUST be
-subscribed to the appropriate mailing list, either
-freebsd-stable or freebsd-current.  For information on
-subscribing to either list (or both), send an e-mail to
-majordomo@freebsd.org with the following in the body, not
-the subject, of the letter as appropriate:
+If you plan to run either -Stable or -Current you MUST be subscribed
+to the appropriate mailing list, either freebsd-stable or
+freebsd-current.  For information on subscribing to either list (or
+both), send an e-mail to majordomo@freebsd.org with the following in
+the body, not the subject, of the letter as appropriate:
 
 subscribe freebsd-stable
 subscribe freebsd-current
 end
 
-We hope you enjoy using FreeBSD as much as we enjoyed
-creating it!
+We hope you enjoy using FreeBSD as much as we enjoyed creating it!
diff --git a/release/texts/alpha/RELNOTES.TXT b/release/texts/alpha/RELNOTES.TXT
index 478ee180ee70..8d8f93277aec 100644
--- a/release/texts/alpha/RELNOTES.TXT
+++ b/release/texts/alpha/RELNOTES.TXT
@@ -1,8 +1,8 @@
                                  RELEASE NOTES
-                           FreeBSD Release 3.4-RELEASE
+                           FreeBSD Release 3.5-RELEASE
 
-Welcome to 3.4-RELEASE, a full follow-on to 3.3-RELEASE released
-October 1999.  In the months since 3.3 was released, many bug fixes and
+Welcome to 3.5-RELEASE, a full follow-on to 3.4-RELEASE released in
+December 1999.  In the months since 3.4 was released, many bug fixes and
 general enhancements have been made to the system.  Please see relevant
 details below.
 
@@ -10,14 +10,14 @@ Any installation failures or crashes should be reported by using the
 send-pr command (those preferring a WEB based interface can also see
 http://www.freebsd.org/send-pr.html).
 
-For information about FreeBSD and the layout of the 3.4-RELEASE
+For information about FreeBSD and the layout of the 3.5-RELEASE
 directory (especially if you're installing from floppies!), see
 ABOUT.TXT.  For installation instructions, see the INSTALL.TXT and
 HARDWARE.TXT files.
 
 Table of contents:
 ------------------
-1. What's new since 3.3-RELEASE
+1. What's new since 3.4-RELEASE
    1.1 KERNEL CHANGES
    1.2 SECURITY FIXES
    1.3 USERLAND CHANGES
@@ -39,7 +39,7 @@ Table of contents:
 6. Acknowledgments
 
 
-1. What's new since 3.3-RELEASE
+1. What's new since 3.4-RELEASE
 ---------------------------------
 
 1.1. KERNEL CHANGES
@@ -453,17 +453,14 @@ LAST resort!
 3.2. CDROM
 ----------
 
-FreeBSD 3.4-RELEASE CDs may be ordered on CDROM from:
+FreeBSD 3.5-RELEASE CDs may be ordered on CDROM from:
 
-        Walnut Creek CDROM
+        BSDi
         4041 Pike Lane, Suite F
         Concord CA  94520
         1-800-786-9907, +1-925-674-0783, +1-925-674-0821 (FAX)
 
-Or via the Internet from orders@cdrom.com or http://www.cdrom.com.
-Their current catalog can be obtained via ftp from:
-
-        ftp://ftp.cdrom.com/cdrom/catalog
+Or via the Internet from orders@osd.bsdi.com or http://www.freebsdmall.com.
 
 Cost per -RELEASE CD is $39.95 or $24.95 with a FreeBSD subscription.
 FreeBSD SNAPshot CDs, when available, are $39.95 or $14.95 with a
@@ -496,12 +493,12 @@ FreeBSD distributions:
 
 In the case of using sources, there are simply two targets you need to
 be aware of: The standard ``upgrade'' target, which will upgrade a 2.x
-or 3.0 system to 3.4 and the ``world'' target, which will take an
+or 3.0 system to 3.5 and the ``world'' target, which will take an
 already upgraded system and keep it in sync with whatever changes have
 happened since the initial upgrade.
 
 In the case of using the binary upgrade option, the system will go
-straight to 3.4/ELF but also populate the /<basepath>/lib/aout
+straight to 3.5/ELF but also populate the /<basepath>/lib/aout
 directories for backwards compatibility with older binaries.
 
 In either case, going to ELF will mean that you'll have somewhat
diff --git a/release/texts/i386/RELNOTES.TXT b/release/texts/i386/RELNOTES.TXT
index 859911d162cf..675e788ac69d 100644
--- a/release/texts/i386/RELNOTES.TXT
+++ b/release/texts/i386/RELNOTES.TXT
@@ -1,7 +1,7 @@
-                  RELEASE NOTES - FREEBSD 3.4-RELEASE
+                  RELEASE NOTES - FREEBSD 3.5-RELEASE
 
-Welcome to 3.4-RELEASE, a full follow-on to 3.3-RELEASE which was
-shipped in October 1999.  In the months since 3.3 was released, many
+Welcome to 3.5-RELEASE, a full follow-on to 3.4-RELEASE which was
+shipped in December 1999.  In the months since 3.4 was released, many
 bug fixes and general enhancements have been made to the system.  Please
 see relevant details below.
 
@@ -9,14 +9,14 @@ Any installation failures or crashes should be reported by using the
 send-pr command (those preferring a WEB based interface can also see
 http://www.freebsd.org/send-pr.html).
 
-For information about FreeBSD and the layout of the 3.4-RELEASE
+For information about FreeBSD and the layout of the 3.5-RELEASE
 directory (especially if you're installing from floppies!), see
 ABOUT.TXT.  For installation instructions, see the INSTALL.TXT and
 HARDWARE.TXT files.
 
 Table of contents:
 ------------------
-1. What's new since 3.3-RELEASE
+1. What's new since 3.4-RELEASE
    1.1 KERNEL CHANGES
    1.2 SECURITY FIXES
    1.3 USERLAND CHANGES
@@ -38,7 +38,7 @@ Table of contents:
 6. Acknowledgments
 
 
-1. What's new since 3.3-RELEASE
+1. What's new since 3.4-RELEASE
 ---------------------------------
 
 1.1. KERNEL CHANGES
@@ -456,17 +456,14 @@ LAST resort!
 3.2. CDROM
 ----------
 
-FreeBSD 3.4-RELEASE CDs may be ordered on CDROM from:
+FreeBSD 3.5-RELEASE CDs may be ordered on CDROM from:
 
-        Walnut Creek CDROM
+        BSDi
         4041 Pike Lane, Suite F
         Concord CA  94520
         1-800-786-9907, +1-925-674-0783, +1-925-674-0821 (FAX)
 
-Or via the Internet from orders@cdrom.com or http://www.cdrom.com.
-Their current catalog can be obtained via ftp from:
-
-        ftp://ftp.cdrom.com/cdrom/catalog
+Or via the Internet from orders@osd.bsdi.com or http://www.freebsdmall.com.
 
 Cost per -RELEASE CD is $39.95 or $24.95 with a FreeBSD subscription.
 FreeBSD SNAPshot CDs, when available, are $39.95 or $14.95 with a
@@ -499,12 +496,12 @@ FreeBSD distributions:
 
 In the case of using sources, there are simply two targets you need to
 be aware of: The standard ``upgrade'' target, which will upgrade a 2.x
-or 3.0 system to 3.4 and the ``world'' target, which will take an
+or 3.0 system to 3.5 and the ``world'' target, which will take an
 already upgraded system and keep it in sync with whatever changes have
 happened since the initial upgrade.
 
 In the case of using the binary upgrade option, the system will go
-straight to 3.4/ELF but also populate the /<basepath>/lib/aout
+straight to 3.5/ELF but also populate the /<basepath>/lib/aout
 directories for backwards compatibility with older binaries.
 
 In either case, going to ELF will mean that you'll have somewhat