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
This commit is contained in:
bmah
parent
721b742b1e
commit
28d947c7dc
@ -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"
|
||||
|
||||
@ -18,8 +18,5 @@
|
||||
]>
|
||||
|
||||
<article>
|
||||
&artheader;
|
||||
§.intro;
|
||||
§.new;
|
||||
§.upgrading;
|
||||
&art;
|
||||
</article>
|
||||
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
|
||||
|
||||
@ -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">
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -18,8 +18,5 @@
|
||||
]>
|
||||
|
||||
<article>
|
||||
&artheader;
|
||||
§.intro;
|
||||
§.new;
|
||||
§.upgrading;
|
||||
&art;
|
||||
</article>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user