diff options
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 19 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 19 | ||||
| -rw-r--r-- | release/doc/share/sgml/release.ent | 13 |
3 files changed, 27 insertions, 24 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index 9580bab..5b303e2 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -40,6 +40,16 @@ It also provides some notes on upgrading from previous versions of &os;.</para> +<![ %release.type.current [ + + <para>The &release.type; distribution to which these release notes + apply represents the latest point along the &release.branch; development + branch since &release.branch; is created. Some pre-built, binary + &release.type; distributions along this branch + can be found at <ulink url="&release.url;"></ulink>.</para> + +]]> + <![ %release.type.snapshot [ <para>The &release.type; distribution to which these release notes @@ -64,15 +74,6 @@ ]]> - <para>Users who are new to the &release.branch; series of &os; - &release.type;s should also read the <quote>Early Adopters Guide - to &os; &release.current;</quote>. This document can generally be - found in the same location as the release notes (either as a part of a - &os; distribution or on the &os; Web site). It contains important - information regarding the advantages and disadvantages of using - &os; &release.current;, as opposed to releases based on the &os; - 4-STABLE development branch.</para> - <para>All users are encouraged to consult the release errata before installing &os;. The errata document is updated with <quote>late-breaking</quote> information discovered late in the diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml index 9580bab..5b303e2 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -40,6 +40,16 @@ It also provides some notes on upgrading from previous versions of &os;.</para> +<![ %release.type.current [ + + <para>The &release.type; distribution to which these release notes + apply represents the latest point along the &release.branch; development + branch since &release.branch; is created. Some pre-built, binary + &release.type; distributions along this branch + can be found at <ulink url="&release.url;"></ulink>.</para> + +]]> + <![ %release.type.snapshot [ <para>The &release.type; distribution to which these release notes @@ -64,15 +74,6 @@ ]]> - <para>Users who are new to the &release.branch; series of &os; - &release.type;s should also read the <quote>Early Adopters Guide - to &os; &release.current;</quote>. This document can generally be - found in the same location as the release notes (either as a part of a - &os; distribution or on the &os; Web site). It contains important - information regarding the advantages and disadvantages of using - &os; &release.current;, as opposed to releases based on the &os; - 4-STABLE development branch.</para> - <para>All users are encouraged to consult the release errata before installing &os;. The errata document is updated with <quote>late-breaking</quote> information discovered late in the diff --git a/release/doc/share/sgml/release.ent b/release/doc/share/sgml/release.ent index a3a700a..0f67227 100644 --- a/release/doc/share/sgml/release.ent +++ b/release/doc/share/sgml/release.ent @@ -6,12 +6,12 @@ <!-- Version of the OS we're describing. This needs to be updated with each new release. --> -<!ENTITY release.current "5.2-CURRENT"> +<!ENTITY release.current "6.0-CURRENT"> <!-- The previous version used for comparison in the "What's New" section. For -CURRENT, we might point back to the last branchpoint. --> -<!ENTITY release.prev "5.2.1-RELEASE"> +<!ENTITY release.prev "5.3-RELEASE"> <!-- The previous stable release, useful for pointing user's at the release they SHOULD be running if they don't want the bleeding @@ -20,13 +20,13 @@ <!-- The previous historical release. Used only to tell what was the cutoff point for "historic" release notes. --> -<!ENTITY release.prev.historic "5.2-RELEASE"> +<!ENTITY release.prev.historic "5.3-RELEASE"> <!-- The next version to be released, usually used for snapshots. --> <!ENTITY release.next "5.3-RELEASE"> <!-- The name of this branch. --> -<!ENTITY release.branch "5-CURRENT"> +<!ENTITY release.branch "6-CURRENT"> <!-- The URL for obtaining this version of FreeBSD. --> <!ENTITY release.url "http://snapshots.jp.FreeBSD.org/"> @@ -34,7 +34,8 @@ <!-- The type of release (usually this will be either "snapshot" or "release" --> <!ENTITY release.type "snapshot"> -<!ENTITY % release.type.snapshot "INCLUDE"> +<!ENTITY % release.type.current "INCLUDE"> +<!ENTITY % release.type.snapshot "IGNORE"> <!ENTITY % release.type.release "IGNORE"> <!-- The manpaths for man page references --> @@ -42,7 +43,7 @@ <!ENTITY release.manpath.xfree86 "4.3.0"> <!ENTITY release.manpath.netbsd "1.6.1"> <!ENTITY release.manpath.freebsd-ports "Ports"> -<!ENTITY release.manpath.freebsd "5.2-current"> +<!ENTITY release.manpath.freebsd "6.0-current"> <!-- Text constants which probably don't need to be changed.--> |
