diff options
author | bmah <bmah@FreeBSD.org> | 2001-10-04 22:40:19 +0000 |
---|---|---|
committer | bmah <bmah@FreeBSD.org> | 2001-10-04 22:40:19 +0000 |
commit | 28d947c7dc72ac261ff9b4e14b585496e81221b4 (patch) | |
tree | 138f4fe50c6f96bb3966d580572cce85bffa84a9 /release | |
parent | 721b742b1e01083e60c581f8cde76d0203604260 (diff) | |
download | FreeBSD-src-28d947c7dc72ac261ff9b4e14b585496e81221b4.zip FreeBSD-src-28d947c7dc72ac261ff9b4e14b585496e81221b4.tar.gz |
Consolidate the various SGML source files making up the release
notes document. Basically, I've moved the contents of common/
{artheader,intro,upgrading}.sgml into common/new.sgml, removed duplicate
$FreeBSD$ markers, and adjusted the various references to these files.
No other whitespace or content changes.
This change will make it easier to do some minor restructuring.
MFC after: 1 day
Diffstat (limited to 'release')
10 files changed, 179 insertions, 109 deletions
diff --git a/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile b/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile index ad0f5bc..99756df 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile +++ b/release/doc/en_US.ISO8859-1/relnotes/alpha/Makefile @@ -10,10 +10,7 @@ INSTALL_ONLY_COMPRESSED?= # SGML content SRCS+= article.sgml SRCS+= ../common/relnotes.ent -SRCS+= ../common/artheader.sgml -SRCS+= ../common/intro.sgml SRCS+= ../common/new.sgml -SRCS+= ../common/upgrading.sgml .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml index 99cdc4b..0fc12a9 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/alpha/article.sgml @@ -18,8 +18,5 @@ ]> <article> - &artheader; - §.intro; - §.new; - §.upgrading; + &art; </article> diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index e3d91c8..7abd991 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -1,3 +1,51 @@ +<articleinfo> + <title>&os; &release.current; &arch; Release Notes</title> + + <corpauthor>The FreeBSD Project</corpauthor> + + <copyright> + <year>2000</year> + <year>2001</year> + <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> + </copyright> +</articleinfo> + +<!-- + Introduction to the release notes, adapted from the + introduction to the old RELNOTES.TXT. +--> + +<sect1> + <title>Introduction</title> + + <para>This document contains the release notes for &os; &release.current; on + the &arch; hardware platform. It describes new features of &os; + that have been added (or changed) since &release.prev;.</para> + +<![ %release.type.snapshot [ + + <para>The &release.type; distribution to which these release notes + apply represents a point along the &release.branch; development + branch between &release.prev; and &release.next;. Some pre-built, + binary &release.type; distributions along this branch can be found + at <ulink url="&release.url;"></ulink>.</para> + +]]> + +<![ %release.type.release [ + + <para>This distribution of &os; &release.current; is a &release.type; + distribution. It can be found at <ulink + url="&release.url;"></ulink> or any of its mirrors. More + information on obtaining this (or other) &release.type; distributions of + &os; can be found in the <ulink + url="http://www.FreeBSD.org/handbook/mirrors.html"><quote>Obtaining + FreeBSD</quote> appendix</ulink> to the <ulink + url="http://www.FreeBSD.org/handbook/">FreeBSD Handbook</ulink>.</para> + +]]> +</sect1> + <!-- The "What's New" section of the release notes. Within each subsection (i.e. kernel, security, userland), list @@ -2334,3 +2382,43 @@ </sect3> </sect2> </sect1> + +<!-- + Summary information on upgrading FreeBSD. This comes from + the similarly-named section of RELNOTES.TXT. +--> + +<sect1> + <title>Upgrading from previous releases of &os;</title> + + <para>If you're upgrading from a previous release of &os;, + most likely it's 4.X and there may be some issues affecting you, + depending of course on your chosen method of upgrading. There + are two popular ways of upgrading &os; distributions:</para> + + <para> + <itemizedlist> + <listitem> + <para>Using sources, via <filename>/usr/src</filename></para> + </listitem> + <listitem> + <para>Using the binary upgrade option of &man.sysinstall.8;.</para> + </listitem> + </itemizedlist> + </para> + + <para>Please read the <filename>INSTALL.TXT</filename> file for more + information, preferably <emphasis>before</emphasis> beginning an + upgrade. If you are upgrading from source, please be sure to read + <filename>/usr/src/UPDATING</filename> as well.</para> + + <para>Finally, if you want to use one of various means to track the + -STABLE or -CURRENT branches of &os;, please be sure to consult the + <ulink + url="http://www.FreeBSD.org/handbook/current-stable.html"><quote>-CURRENT + vs. -STABLE</quote></ulink> section of the <ulink + url="http://www.FreeBSD.org/handbook/">FreeBSD + Handbook</ulink>.</para> + +</sect1> + diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/artheader.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/artheader.sgml deleted file mode 100644 index 104657b..0000000 --- a/release/doc/en_US.ISO8859-1/relnotes/common/artheader.sgml +++ /dev/null @@ -1,13 +0,0 @@ -<!-- $FreeBSD$ --> - -<articleinfo> - <title>&os; &release.current; &arch; Release Notes</title> - - <corpauthor>The FreeBSD Project</corpauthor> - - <copyright> - <year>2000</year> - <year>2001</year> - <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> - </copyright> -</articleinfo> diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/intro.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/intro.sgml deleted file mode 100644 index b6e8bb1..0000000 --- a/release/doc/en_US.ISO8859-1/relnotes/common/intro.sgml +++ /dev/null @@ -1,37 +0,0 @@ -<!-- - $FreeBSD$ - - Introduction to the release notes, adapted from the - introduction to the old RELNOTES.TXT. ---> - -<sect1> - <title>Introduction</title> - - <para>This document contains the release notes for &os; &release.current; on - the &arch; hardware platform. It describes new features of &os; - that have been added (or changed) since &release.prev;.</para> - -<![ %release.type.snapshot [ - - <para>The &release.type; distribution to which these release notes - apply represents a point along the &release.branch; development - branch between &release.prev; and &release.next;. Some pre-built, - binary &release.type; distributions along this branch can be found - at <ulink url="&release.url;"></ulink>.</para> - -]]> - -<![ %release.type.release [ - - <para>This distribution of &os; &release.current; is a &release.type; - distribution. It can be found at <ulink - url="&release.url;"></ulink> or any of its mirrors. More - information on obtaining this (or other) &release.type; distributions of - &os; can be found in the <ulink - url="http://www.FreeBSD.org/handbook/mirrors.html"><quote>Obtaining - FreeBSD</quote> appendix</ulink> to the <ulink - url="http://www.FreeBSD.org/handbook/">FreeBSD Handbook</ulink>.</para> - -]]> -</sect1> 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 e3d91c8..7abd991 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -1,3 +1,51 @@ +<articleinfo> + <title>&os; &release.current; &arch; Release Notes</title> + + <corpauthor>The FreeBSD Project</corpauthor> + + <copyright> + <year>2000</year> + <year>2001</year> + <holder role="mailto:doc@FreeBSD.org">The FreeBSD Documentation Project</holder> + </copyright> +</articleinfo> + +<!-- + Introduction to the release notes, adapted from the + introduction to the old RELNOTES.TXT. +--> + +<sect1> + <title>Introduction</title> + + <para>This document contains the release notes for &os; &release.current; on + the &arch; hardware platform. It describes new features of &os; + that have been added (or changed) since &release.prev;.</para> + +<![ %release.type.snapshot [ + + <para>The &release.type; distribution to which these release notes + apply represents a point along the &release.branch; development + branch between &release.prev; and &release.next;. Some pre-built, + binary &release.type; distributions along this branch can be found + at <ulink url="&release.url;"></ulink>.</para> + +]]> + +<![ %release.type.release [ + + <para>This distribution of &os; &release.current; is a &release.type; + distribution. It can be found at <ulink + url="&release.url;"></ulink> or any of its mirrors. More + information on obtaining this (or other) &release.type; distributions of + &os; can be found in the <ulink + url="http://www.FreeBSD.org/handbook/mirrors.html"><quote>Obtaining + FreeBSD</quote> appendix</ulink> to the <ulink + url="http://www.FreeBSD.org/handbook/">FreeBSD Handbook</ulink>.</para> + +]]> +</sect1> + <!-- The "What's New" section of the release notes. Within each subsection (i.e. kernel, security, userland), list @@ -2334,3 +2382,43 @@ </sect3> </sect2> </sect1> + +<!-- + Summary information on upgrading FreeBSD. This comes from + the similarly-named section of RELNOTES.TXT. +--> + +<sect1> + <title>Upgrading from previous releases of &os;</title> + + <para>If you're upgrading from a previous release of &os;, + most likely it's 4.X and there may be some issues affecting you, + depending of course on your chosen method of upgrading. There + are two popular ways of upgrading &os; distributions:</para> + + <para> + <itemizedlist> + <listitem> + <para>Using sources, via <filename>/usr/src</filename></para> + </listitem> + <listitem> + <para>Using the binary upgrade option of &man.sysinstall.8;.</para> + </listitem> + </itemizedlist> + </para> + + <para>Please read the <filename>INSTALL.TXT</filename> file for more + information, preferably <emphasis>before</emphasis> beginning an + upgrade. If you are upgrading from source, please be sure to read + <filename>/usr/src/UPDATING</filename> as well.</para> + + <para>Finally, if you want to use one of various means to track the + -STABLE or -CURRENT branches of &os;, please be sure to consult the + <ulink + url="http://www.FreeBSD.org/handbook/current-stable.html"><quote>-CURRENT + vs. -STABLE</quote></ulink> section of the <ulink + url="http://www.FreeBSD.org/handbook/">FreeBSD + Handbook</ulink>.</para> + +</sect1> + diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent b/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent index 1e8a22d..d52afee 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent +++ b/release/doc/en_US.ISO8859-1/relnotes/common/relnotes.ent @@ -9,8 +9,5 @@ <!-- Files to be included --> -<!ENTITY artheader SYSTEM "../common/artheader.sgml"> -<!ENTITY sect.intro SYSTEM "../common/intro.sgml"> -<!ENTITY sect.new SYSTEM "../common/new.sgml"> -<!ENTITY sect.upgrading SYSTEM "../common/upgrading.sgml"> +<!ENTITY art SYSTEM "../common/new.sgml"> diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/upgrading.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/upgrading.sgml deleted file mode 100644 index a429228..0000000 --- a/release/doc/en_US.ISO8859-1/relnotes/common/upgrading.sgml +++ /dev/null @@ -1,41 +0,0 @@ -<!-- - $FreeBSD$ - - Summary information on upgrading FreeBSD. This comes from - the similarly-named section of RELNOTES.TXT. ---> - -<sect1> - <title>Upgrading from previous releases of &os;</title> - - <para>If you're upgrading from a previous release of &os;, - most likely it's 4.X and there may be some issues affecting you, - depending of course on your chosen method of upgrading. There - are two popular ways of upgrading &os; distributions:</para> - - <para> - <itemizedlist> - <listitem> - <para>Using sources, via <filename>/usr/src</filename></para> - </listitem> - <listitem> - <para>Using the binary upgrade option of &man.sysinstall.8;.</para> - </listitem> - </itemizedlist> - </para> - - <para>Please read the <filename>INSTALL.TXT</filename> file for more - information, preferably <emphasis>before</emphasis> beginning an - upgrade. If you are upgrading from source, please be sure to read - <filename>/usr/src/UPDATING</filename> as well.</para> - - <para>Finally, if you want to use one of various means to track the - -STABLE or -CURRENT branches of &os;, please be sure to consult the - <ulink - url="http://www.FreeBSD.org/handbook/current-stable.html"><quote>-CURRENT - vs. -STABLE</quote></ulink> section of the <ulink - url="http://www.FreeBSD.org/handbook/">FreeBSD - Handbook</ulink>.</para> - -</sect1> - diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile index ad0f5bc..99756df 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile +++ b/release/doc/en_US.ISO8859-1/relnotes/i386/Makefile @@ -10,10 +10,7 @@ INSTALL_ONLY_COMPRESSED?= # SGML content SRCS+= article.sgml SRCS+= ../common/relnotes.ent -SRCS+= ../common/artheader.sgml -SRCS+= ../common/intro.sgml SRCS+= ../common/new.sgml -SRCS+= ../common/upgrading.sgml .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml index acf3463..976c69e 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/i386/article.sgml @@ -18,8 +18,5 @@ ]> <article> - &artheader; - §.intro; - §.new; - §.upgrading; + &art; </article> |