Date: Sat, 2 Feb 2013 00:09:05 -0500 From: Eitan Adler <lists@eitanadler.com> To: freebsd-doc@freebsd.org Message-ID: <CAF6rxgksrYpUHU3awBOi-kujcuTfeys5bgH0abgwREPChKyyNw@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
Can I please get some review of this patch? In particular can someone
comment on the changes to the description of -STABLE. I am almost
certain the description is wrong, but can't seem to find any better
documentation on this.
commit 2178bfca1c982f85791375bd208156d071553429
Author: Eitan Adler <lists@eitanadler.com>
Date: Sat Feb 2 00:05:48 2013 -0500
Update and modernize the version numbers used in the FAQ examples.
Remove references to 7.x (which is EOL in less than a month).
diff --git a/en_US.ISO8859-1/books/faq/book.xml
b/en_US.ISO8859-1/books/faq/book.xml
index abf7d5a..47bc922 100644
--- a/en_US.ISO8859-1/books/faq/book.xml
+++ b/en_US.ISO8859-1/books/faq/book.xml
@@ -18,18 +18,12 @@
<!ENTITY rel2.releng "<symbol>RELENG_8</symbol>">
<!ENTITY rel2.relengdate "August 2009">
<!ENTITY rel2.packages "packages-8-stable">
-<!ENTITY rel3.current "7.4">
-<!ENTITY rel3.relx "7.<replaceable>X</replaceable>">
-<!ENTITY rel3.stable "<emphasis>7-STABLE</emphasis>">
-<!ENTITY rel3.releng "<symbol>RELENG_7</symbol>">
-<!ENTITY rel3.relengdate "October 2007">
-<!ENTITY rel3.packages "packages-7-stable">
]>
<book lang='en'>
<bookinfo>
<title>Frequently Asked Questions for &os;
- &rel3.relx;, &rel2.relx;, and &rel.relx;</title>
+ &rel2.relx;, and &rel.relx;</title>
<corpauthor>The &os; Documentation Project</corpauthor>
@@ -80,10 +74,8 @@
<abstract>
<para>This is the FAQ for &os; versions
- &rel3.relx;, &rel2.relx; and &rel.relx;.
- All entries are assumed to be
- relevant to &os; &rel3.relx; and later,
- unless otherwise noted. If you are interested in helping with
+ &rel2.relx; and &rel.relx;.
+ If you are interested in helping with
this project, send email to the &a.doc;. The latest version of
this document is always available from the <ulink
url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/index.html">&os;
website</ulink>.
@@ -100,7 +92,7 @@
<title>Introduction</title>
<para>Welcome to the &os;
- &rel3.relx; -, &rel2.relx; - and &rel.relx; -
+ &rel2.relx; - and &rel.relx; -
FAQ!</para>
<para>As is usual with Usenet FAQs, this document aims to cover the
@@ -354,14 +346,14 @@
made from the &rel.stable; branch, and &rel2.relx;
releases are made from the &rel2.stable; branch.</para>
- <para>Up until the release of 8.0, the
- &rel3.relx; series was the one known as
- <emphasis>-STABLE</emphasis>. However, as of 8.0, the
- &rel3.relx; branch will be designated for
+ <para>Up until the release of 9.0, the
+ 8.x series was the one known as
+ <emphasis>-STABLE</emphasis>. However, as of 10.0, the
+ 8.x branch will be designated for
an <quote>extended support</quote> status and receive only
fixes for major problems, such as security-related fixes.
There will be no more releases made from the
- &rel3.stable; branch, and it is considered a
+ &rel2.stable; branch, and it is considered a
<quote>legacy</quote> branch and most current work will only
become a part of &rel.stable; and &rel2.stable;.</para>
@@ -2730,7 +2722,7 @@ kern.timecounter.hardware: TSC -> i8254</screen>
periodic updates on new entries.</para>
<para>Most ports should work on the
- &rel3.relx;, &rel2.relx;, and &rel.relx; branches.
+ &rel2.relx;, and &rel.relx; branches.
Each time a &os;
release is made, a snapshot of the ports tree at the time of
release in also included in the <filename
class="directory">ports/</filename>
@@ -2755,15 +2747,6 @@ kern.timecounter.hardware: TSC -> i8254</screen>
<variablelist>
<varlistentry>
- <term>for &rel3.relx; -RELEASE/&rel3.stable;</term>
-
- <listitem>
- <para><ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel3.packages;</ulink></para>;
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>for &rel2.relx; -RELEASE/&rel2.stable;</term>
<listitem>
@@ -2836,7 +2819,7 @@ kern.timecounter.hardware: TSC -> i8254</screen>
<qandaentry>
<question id="ports-4x">
<para>Why can I not build this port on my
- &rel3.relx; -, &rel2.relx; -, or
+ &rel2.relx; -, or
&rel.relx; -STABLE machine?</para>
</question>
@@ -4723,8 +4706,8 @@ options SYSVMSG # enable for
messaging</programlisting>
the same way as <emphasis>-PRERELEASE</emphasis>.)</para>
<para>Long answer: &os; derives its releases from one of two
- places. Major, dot-zero, releases, such as 7.0-RELEASE and
- 8.0-RELEASE, are branched from the head of the development
+ places. Major, dot-zero, releases, such as 9.0-RELEASE
+ are branched from the head of the development
stream, commonly referred to as <link
linkend="current">-CURRENT</link>. Minor releases, such as
6.3-RELEASE or 5.2-RELEASE, have been snapshots of the
@@ -8266,11 +8249,6 @@ hint.sio.7.irq="12"</programlisting>
<itemizedlist>
<listitem>
- <para>&rel3.releng; AKA
- &rel3.stable;</para>
- </listitem>
-
- <listitem>
<para>&rel2.releng; AKA
&rel2.stable;</para>
</listitem>
--
Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgksrYpUHU3awBOi-kujcuTfeys5bgH0abgwREPChKyyNw>