PERFORCE change 152329 for review
Rene Ladan
rene at FreeBSD.org
Sat Nov 1 14:17:05 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=152329
Change 152329 by rene at rene_self on 2008/11/01 21:16:46
Oops, do two things at once:
* IFC
* Translate 'contributing' article up to 13%
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#10 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#2 edit
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#8 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/versus.key#1 branch
.. //depot/projects/docproj_nl/www/en/developers.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#7 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#14 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#11 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.245 2008/10/06 13:59:02 lstewart Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.246 2008/11/01 11:08:11 versus Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -547,6 +547,10 @@
</listitem>
<listitem>
+ <para>&a.versus;</para>
+ </listitem>
+
+ <listitem>
<para>&a.raj;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 (text+ko) ====
@@ -27,7 +27,7 @@
ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
- $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.47 2007/12/30 02:40:32 danger Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.48 2008/10/31 12:23:35 pgj Exp $
-->
<chapter id="sgml-primer">
@@ -65,8 +65,8 @@
like that, and our computers require some assistance before they can
meaningfully process our text.</para>
- <para>More precisely, they need help identifying what is what. You or I
- can look at
+ <para>More precisely, they need help identifying what is what. Let's
+ look at this text:</para>
<blockquote>
<para>To remove <filename>/tmp/foo</filename> use &man.rm.1;.</para>
@@ -74,7 +74,7 @@
<screen>&prompt.user; <userinput>rm /tmp/foo</userinput></screen>
</blockquote>
- and easily see which parts are filenames, which are commands to be typed
+ <para>It is easy to see which parts are filenames, which are commands to be typed
in, which parts are references to manual pages, and so on. But the
computer processing the document cannot. For this we need
markup.</para>
@@ -204,15 +204,15 @@
<para>For an element called <replaceable>element-name</replaceable> the
start tag will normally look like
- <literal><<replaceable>element-name</replaceable>></literal>. The
+ <sgmltag><replaceable>element-name</replaceable></sgmltag>. The
corresponding closing tag for this element is
- <literal></<replaceable>element-name</replaceable>></literal>.</para>
+ <sgmltag>/<replaceable>element-name</replaceable></sgmltag>.</para>
<example>
<title>Using an element (start and end tags)</title>
<para>HTML has an element for indicating that the content enclosed by
- the element is a paragraph, called <literal>p</literal>. This
+ the element is a paragraph, called <sgmltag>p</sgmltag>. This
element has both start and end tags.</para>
<programlisting><![ CDATA [<p>This is a paragraph. It starts with the start tag for
@@ -231,7 +231,7 @@
<title>Using an element (start tag only)</title>
<para>HTML has an element for indicating a horizontal rule, called
- <literal>hr</literal>. This element does not wrap content, so only
+ <sgmltag>hr</sgmltag>. This element does not wrap content, so only
has a start tag.</para>
<programlisting><![ CDATA [<p>This is a paragraph.</p>
@@ -266,10 +266,10 @@
end.</para>
<para>When this document (or anyone else knowledgeable about SGML) refers
- to <quote>the <p> tag</quote> they mean the literal text
+ to <quote>the <sgmltag>p</sgmltag> tag</quote> they mean the literal text
consisting of the three characters <literal><</literal>,
<literal>p</literal>, and <literal>></literal>. But the phrase
- <quote>the <p> element</quote> refers to the whole
+ <quote>the <sgmltag>p</sgmltag> element</quote> refers to the whole
element.</para>
<para>This distinction <emphasis>is</emphasis> very subtle. But keep it
@@ -287,7 +287,7 @@
<literal><replaceable>attribute-name</replaceable>="<replaceable>attribute-value</replaceable>"</literal>.</para>
<para>In sufficiently recent versions of HTML, the <sgmltag>p</sgmltag>
- element has an attribute called <literal>align</literal>, which suggests
+ element has an attribute called <sgmltag>align</sgmltag>, which suggests
an alignment (justification) for the paragraph to the program displaying
the HTML.</para>
@@ -494,7 +494,7 @@
<row>
<entry>6</entry>
- <entry>The text of the error message.</entry>
+ <entry>The text of the message.</entry>
</row>
</tbody>
</tgroup>
@@ -519,7 +519,7 @@
</step>
<step>
- <para>Put the <literal>title</literal> element back in.</para>
+ <para>Put the <sgmltag>title</sgmltag> element back in.</para>
</step>
</procedure>
</sect2>
@@ -781,7 +781,7 @@
<sect1 id="sgml-primer-sgml-escape">
<title>Escaping back to SGML</title>
- <para>Earlier in this primer I said that SGML is only used when writing a
+ <para>As mentioned earlier, SGML is only used when writing a
DTD. This is not strictly true. There is certain SGML syntax that you
will want to be able to use within your documents. For example,
comments can be included in your document, and will be ignored by the
@@ -1379,7 +1379,7 @@
characters.</para>
<para><literal>RCDATA</literal> is for <quote>Entity references and
- character data</quote> If the parser is in this content model then it
+ character data</quote>. If the parser is in this content model then it
is expecting to see characters <emphasis>and</emphasis> entities.
<literal><</literal> loses its special status, but
<literal>&</literal> will still be treated as
@@ -1392,7 +1392,7 @@
<literal><</literal> is converted to a
<literal>&lt;</literal> and every <literal>&</literal>
is converted to a <literal>&amp;</literal>, it can be
- easier to mark the section as only containing CDATA. When the SGML
+ easier to mark the section as only containing <literal>CDATA</literal>. When the SGML
parser encounters this it will ignore the
<literal><</literal> and <literal>&</literal> symbols
embedded in the content.</para>
@@ -1534,7 +1534,7 @@
<body>
<p>This paragraph <![ CDATA [contains many <
characters (< < < < <) so it is easier
- to wrap it in a CDATA marked section ]]></p>
+ to wrap it in a CDATA marked section.]]></p>
<![ IGNORE [
<p>This paragraph will definitely not be included in the
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.234 2008/09/17 19:27:10 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml,v 1.235 2008/11/01 11:13:46 brueffer Exp $
-->
<chapter id="config-tuning">
@@ -623,7 +623,7 @@
</callout>
</calloutlist>
- <para>This is the basic set up for every
+ <para>This is the basic setup for every
<filename>crontab</filename> file, although there is one thing
different about this one. Field number six, where we specified
the username, only exists in the system
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.228 2008/07/17 18:59:04 danger Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.230 2008/11/01 12:06:28 manolis Exp $
-->
<chapter id="cutting-edge">
@@ -14,20 +14,24 @@
</author>
<!-- Mar 2000 -->
</authorgroup>
+
<authorgroup>
<author>
<firstname>Jordan</firstname>
<surname>Hubbard</surname>
<contrib>Original work by </contrib>
</author>
+
<author>
<firstname>Poul-Henning</firstname>
<surname>Kamp</surname>
</author>
+
<author>
<firstname>John</firstname>
<surname>Polstra</surname>
</author>
+
<author>
<firstname>Nik</firstname>
<surname>Clayton</surname>
@@ -52,31 +56,48 @@
<para>After reading this chapter, you will know:</para>
<itemizedlist>
- <listitem><para>The difference between the two development
- branches: &os.stable; and &os.current;.</para>
+ <listitem>
+ <para>The difference between the two development
+ branches: &os.stable; and &os.current;.</para>
</listitem>
- <listitem><para>How to keep your system up to date with
+
+ <listitem>
+ <para>How to keep your system up to date with
<application>CVSup</application>,
<application>CVS</application>, or
<application>CTM</application>.</para>
</listitem>
- <listitem><para>How to rebuild and reinstall the entire base
- system with <command>make buildworld</command> (etc).</para>
+
+ <listitem>
+ <para>How to rebuild and reinstall the entire base
+ system with <command>make buildworld</command> (etc).</para>
</listitem>
-
</itemizedlist>
<para>Before reading this chapter, you should:</para>
<itemizedlist>
- <listitem><para>Properly set up your network connection (<xref
- linkend="advanced-networking">).</para>
+ <listitem>
+ <para>Properly set up your network connection (<xref
+ linkend="advanced-networking">).</para>
+ </listitem>
+
+ <listitem>
+ <para>Know how to install additional third-party
+ software (<xref linkend="ports">).</para>
</listitem>
- <listitem><para>Know how to install additional third-party
- software (<xref linkend="ports">).</para></listitem>
</itemizedlist>
+
+ <note>
+ <para>Throughout this chapter, the <command>cvsup</command> command is
+ used to obtain and update &os; sources. To use it, you will need to
+ install a port or package like <filename
+ role="package">net/cvsup-without-gui</filename>. If you are using
+ &os; 6.2-RELEASE or later, you may wish to substitute this
+ with &man.csup.1;, which is now part of the base system.</para>
+ </note>
</sect1>
-
+
<sect1 id="current-stable">
<title>&os.current; vs. &os.stable;</title>
<indexterm><primary>-CURRENT</primary></indexterm>
@@ -95,7 +116,7 @@
&os.current; users are expected to have a high degree of
technical skill, and should be capable of solving difficult
system problems on their own. If you are new to &os;, think
- twice before installing it. </para>
+ twice before installing it.</para>
<sect3>
<title>What Is &os.current;?</title>
@@ -184,31 +205,33 @@
<sect3>
<title>Using &os.current;</title>
-
+
<indexterm>
<primary>-CURRENT</primary>
<secondary>using</secondary>
</indexterm>
<orderedlist>
<listitem>
- <para>Join the &a.current.name; and the &a.cvsall.name; lists. This is not
- just a good idea, it is <emphasis>essential</emphasis>. If
- you are not on the <emphasis>&a.current.name;</emphasis> list,
- you will not see the comments that people are
- making about the current state of the system and thus will
- probably end up stumbling over a lot of problems that others
- have already found and solved. Even more importantly, you
- will miss out on important bulletins which may be critical
- to your system's continued health.</para>
+ <para>Join the &a.current.name; and the &a.svn-src-head.name;
+ lists. This is not just a good idea, it is
+ <emphasis>essential</emphasis>. If you are not on the
+ <emphasis>&a.current.name;</emphasis> list, you will not see
+ the comments that people are making about the current state of
+ the system and thus will probably end up stumbling over a lot
+ of problems that others have already found and solved. Even
+ more importantly, you will miss out on important bulletins
+ which may be critical to your system's continued health.</para>
- <para>The &a.cvsall.name; list will allow you to see the
- commit log entry for each change as it is made along with
+ <para>The &a.svn-src-head.name; list will allow you to see the
+ commit log entry for each change as it is made, along with
any pertinent information on possible side-effects.</para>
<para>To join these lists, or one of the others available
go to &a.mailman.lists.link; and click on the list that
you wish to subscribe to. Instructions on the rest of
- the procedure are available there.</para>
+ the procedure are available there. If you are interested
+ in tracking changes for the whole source tree, we would
+ recommend subscribing to the &a.svn-src-all.name; list.</para>
</listitem>
<listitem>
@@ -216,47 +239,66 @@
site</link>. You can do this in one of two ways:</para>
<orderedlist>
- <indexterm>
- <primary><command>cvsup</command></primary>
- </indexterm>
- <indexterm>
- <primary><command>cron</command></primary>
- </indexterm>
- <indexterm>
- <primary>-CURRENT</primary>
+ <indexterm>
+ <primary><command>cvsup</command></primary>
+ </indexterm>
+ <indexterm>
+ <primary><command>cron</command></primary>
+ </indexterm>
+ <indexterm>
+ <primary>-CURRENT</primary>
<secondary>Syncing with <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Use the <link linkend="cvsup">cvsup</link> program
- with the <filename>supfile</filename> named <filename>standard-supfile</filename>
- available from <filename>/usr/share/examples/cvsup</filename>.
- This is the most recommended
- method, since it allows you to grab the entire
- collection once and then only what has changed from then
- on. Many people run <command>cvsup</command> from
- <command>cron</command> and keep their
- sources up-to-date automatically. You have to
- customize the sample <filename>supfile</filename> above, and configure
- <link linkend="cvsup">cvsup</link> for your environment.</para>
+ with the <filename>supfile</filename> named
+ <filename>standard-supfile</filename>
+ available from
+ <filename>/usr/share/examples/cvsup</filename>.
+ This is the most recommended method, since it allows you to
+ grab the entire collection once and then only what has
+ changed from then on. Many people run
+ <command>cvsup</command> from <command>cron</command> and
+ keep their sources up-to-date automatically. You have to
+ customize the sample <filename>supfile</filename> above,
+ and configure <link
+ linkend="cvsup">cvsup</link> for your environment.</para>
+
+ <note>
+ <para>The sample <filename>standard-supfile</filename> is
+ intended for tracking a specific security branch of
+ &os;, and not &os.current;. You will need to edit this
+ file and replace the following line:</para>
+
+ <screen>*default release=cvs tag=RELENG_<replaceable>X</replaceable>_<replaceable>Y</replaceable></screen>
+
+ <para>With this one:</para>
+
+ <screen>*default release=cvs tag=.</screen>
+
+ <para>For a detailed explanation of usable tags, please
+ refer to the Handbook's <link
+ linkend="cvs-tags">CVS Tags</link> section.</para>
+ </note>
</listitem>
- <indexterm>
- <primary>-CURRENT</primary>
+ <indexterm>
+ <primary>-CURRENT</primary>
<secondary>Syncing with CTM</secondary>
</indexterm>
<listitem>
<para>Use the <application><link
- linkend="ctm">CTM</link></application> facility. If you
+ linkend="ctm">CTM</link></application> facility. If you
have very bad connectivity (high price connections or
- only email access) <application>CTM</application> is an option.
- However, it is a lot of hassle and can give you broken files.
- This leads to it being rarely used, which again increases
- the chance of it not working for fairly long periods of
- time. We recommend using
+ only email access) <application>CTM</application> is an
+ option. However, it is a lot of hassle and can give you
+ broken files. This leads to it being rarely used, which
+ again increases the chance of it not working for fairly
+ long periods of time. We recommend using
<application><link linkend="cvsup">CVSup</link></application>
- for anybody with a 9600 bps modem or faster connection.
- </para>
+ for anybody with a 9600 bps modem or faster
+ connection.</para>
</listitem>
</orderedlist>
</listitem>
@@ -269,20 +311,21 @@
to compile just a subset is almost guaranteed to get you
into trouble.</para>
- <indexterm>
- <primary>-CURRENT</primary>
- <secondary>compiling</secondary>
- </indexterm>
+ <indexterm>
+ <primary>-CURRENT</primary>
+ <secondary>compiling</secondary>
+ </indexterm>
<para>Before compiling &os.current;, read the
<filename>Makefile</filename> in <filename>/usr/src</filename>
carefully. You should at least <link
- linkend="makeworld">install a new kernel and rebuild the world</link> the first time through
+ linkend="makeworld">install a new kernel and rebuild the
+ world</link> the first time through
as part of the upgrading process. Reading the &a.current;
- and <filename>/usr/src/UPDATING</filename> will keep you up-to-date on other bootstrapping procedures
- that sometimes become necessary as we move toward the next
- release.</para>
+ and <filename>/usr/src/UPDATING</filename> will keep you
+ up-to-date on other bootstrapping procedures that sometimes
+ become necessary as we move toward the next release.</para>
</listitem>
-
+
<listitem>
<para>Be active! If you are running &os.current;, we want
to know what you have to say about it, especially if you
@@ -293,7 +336,7 @@
</orderedlist>
</sect3>
</sect2>
-
+
<sect2 id="stable">
<title>Staying Stable with &os;</title>
@@ -305,8 +348,8 @@
are made. Changes go into this branch at a different pace, and
with the general assumption that they have first gone into
&os.current; for testing. This is <emphasis>still</emphasis>
- a development branch, however, and this means that at any given time,
- the sources for &os.stable; may or may not be suitable for any
+ a development branch, however, and this means that at any given
+ time, the sources for &os.stable; may or may not be suitable for any
particular purpose. It is simply another engineering development
track, not a resource for end-users.</para>
</sect3>
@@ -315,23 +358,23 @@
<title>Who Needs &os.stable;?</title>
<para>If you are interested in tracking or contributing to the
- FreeBSD development process, especially as it relates to the
+ FreeBSD development process, especially as it relates to the
next <quote>point</quote> release of FreeBSD, then you should
consider following &os.stable;.</para>
<para>While it is true that security fixes also go into the
&os.stable; branch, you do not <emphasis>need</emphasis> to
- track &os.stable; to do this. Every security advisory for
+ track &os.stable; to do this. Every security advisory for
FreeBSD explains how to fix the problem for the releases it
affects
<footnote><para>That is not quite true. We can not continue to
- support old releases of FreeBSD forever, although we do
- support them for many years. For a complete description
- of the current security policy for old releases of
- FreeBSD, please see <ulink
- url="&url.base;/security/">http://www.FreeBSD.org/security/</ulink>.</para>
- </footnote>
- , and tracking an entire development branch just
+ support old releases of FreeBSD forever, although we do
+ support them for many years. For a complete description
+ of the current security policy for old releases of
+ FreeBSD, please see <ulink
+ url="&url.base;/security/">http://www.FreeBSD.org/security/</ulink>.</para>
+ </footnote>,
+ and tracking an entire development branch just
for security reasons is likely to bring in a lot of unwanted
changes as well.</para>
@@ -355,38 +398,42 @@
<sect3>
<title>Using &os.stable;</title>
-
+
<indexterm>
<primary>-STABLE</primary>
<secondary>using</secondary>
</indexterm>
<orderedlist>
<listitem>
- <para>Join the &a.stable.name; list. This will keep you informed of
- build-dependencies that may appear in &os.stable;
- or any other issues requiring
- special attention. Developers will also make announcements
- in this mailing list when they are contemplating some
- controversial fix or update, giving the users a chance to
- respond if they have any issues to raise concerning the
- proposed change.</para>
+ <para>Join the &a.stable.name; list. This will keep you informed
+ of build-dependencies that may appear in &os.stable;
+ or any other issues requiring special attention. Developers
+ will also make announcements in this mailing list when they are
+ contemplating some controversial fix or update, giving the
+ users a chance to respond if they have any issues to raise
+ concerning the proposed change.</para>
- <para>The &a.cvsall.name; list will allow you to see the
- commit log entry for each change as it is made along with
- any pertinent information on possible side-effects.</para>
+ <para>Join the relevant <application>SVN</application> list for
+ the branch you are tracking. For example, if you are tracking
+ the 7-STABLE branch, join the &a.svn-src-stable-7.name; list.
+ This will allow you to view the commit log entry for each
+ change as it is made, along with any pertinent information on
+ possible side-effects.</para>
<para>To join these lists, or one of the others available
go to &a.mailman.lists.link; and click on the list that
you wish to subscribe to. Instructions on the rest of
- the procedure are available there.</para>
+ the procedure are available there. If you are interested
+ in tracking changes for the whole source tree, we would
+ recommend subscribing to the &a.svn-src-all.name; list.</para>
</listitem>
<listitem>
<para>If you are going to install a new system and want it
to run monthly snapshot built from &os.stable;, please
- check the <ulink url="&url.base;/snapshots/">
- Snapshots</ulink> web page for more information.
- Alternatively, it is possible to
+ check the <ulink
+ url="&url.base;/snapshots/">Snapshots</ulink> web page for
+ more information. Alternatively, it is possible to
install the most recent &os.stable; release from the
<link linkend="mirrors">mirror sites</link> and follow
the instructions below to upgrade your system to the
@@ -405,39 +452,37 @@
<primary><command>cron</command></primary>
</indexterm>
<indexterm>
- <primary>-STABLE</primary>
+ <primary>-STABLE</primary>
<secondary>syncing with <application>CVSup</application></secondary>
</indexterm>
<listitem>
<para>Use the <link linkend="cvsup">cvsup</link> program
- with the <filename>supfile</filename> named <filename>stable-supfile</filename>
- from the directory
- <filename>/usr/share/examples/cvsup</filename>.
- This is the most recommended
- method, since it allows you to grab the entire
- collection once and then only what has changed from then
- on. Many people run <command>cvsup</command> from
- <command>cron</command> to keep their
- sources up-to-date automatically. You have to
+ with the <filename>supfile</filename> named
+ <filename>stable-supfile</filename> from the directory
+ <filename>/usr/share/examples/cvsup</filename>.
+ This is the most recommended method, since it allows you to
+ grab the entire collection once and then only what has
+ changed from then on. Many people run
+ <command>cvsup</command> from <command>cron</command> to
+ keep their sources up-to-date automatically. You have to
customize the sample <filename>supfile</filename> above,
and configure <link linkend="cvsup">cvsup</link> for your
environment.</para>
</listitem>
<indexterm>
- <primary>-STABLE</primary>
+ <primary>-STABLE</primary>
<secondary>syncing with CTM</secondary>
</indexterm>
<listitem>
<para>Use the <application><link
- linkend="ctm">CTM</link></application> facility. If
+ linkend="ctm">CTM</link></application> facility. If
you do not have a fast and inexpensive connection to
the Internet, this is the method you should consider
- using.
- </para>
+ using.</para>
</listitem>
- </orderedlist>
- </listitem>
+ </orderedlist>
+ </listitem>
<listitem>
<para>Essentially, if you need rapid on-demand access to the
@@ -454,11 +499,12 @@
<para>Before compiling &os.stable;, read the
<filename>Makefile</filename> in <filename>/usr/src</filename>
carefully. You should at least <link
- linkend="makeworld">install a new kernel and rebuild the world</link> the first time through
- as part of the upgrading process. Reading the &a.stable; and <filename>/usr/src/UPDATING</filename> will
- keep you up-to-date on other bootstrapping procedures that
- sometimes become necessary as we move toward the next
- release.</para>
+ linkend="makeworld">install a new kernel and rebuild the
+ world</link> the first time through
+ as part of the upgrading process. Reading the &a.stable; and
+ <filename>/usr/src/UPDATING</filename> will keep you up-to-date
+ on other bootstrapping procedures that sometimes become
+ necessary as we move toward the next release.</para>
</listitem>
</orderedlist>
</sect3>
@@ -467,23 +513,23 @@
<sect1 id="synching">
<title>Synchronizing Your Source</title>
-
+
<para>There are various ways of using an Internet (or email)
connection to stay up-to-date with any given area of the &os;
project sources, or all areas, depending on what interests you. The
primary services we offer are <link linkend="anoncvs">Anonymous
CVS</link>, <link linkend="cvsup">CVSup</link>, and <link
- linkend="ctm">CTM</link>.</para>
+ linkend="ctm">CTM</link>.</para>
<warning>
<para>While it is possible to update only parts of your source tree,
- the only supported update procedure is to update the entire tree
- and recompile both userland (i.e., all the programs that run in
- user space, such as those in <filename>/bin</filename> and
- <filename>/sbin</filename>) and kernel sources. Updating only part
- of your source tree, only the kernel, or only userland will often
- result in problems. These problems may range from compile errors
- to kernel panics or data corruption.</para>
+ the only supported update procedure is to update the entire tree
+ and recompile both userland (i.e., all the programs that run in
+ user space, such as those in <filename>/bin</filename> and
+ <filename>/sbin</filename>) and kernel sources. Updating only part
+ of your source tree, only the kernel, or only userland will often
+ result in problems. These problems may range from compile errors
+ to kernel panics or data corruption.</para>
</warning>
<indexterm>
@@ -494,7 +540,7 @@
<para><application>Anonymous CVS</application> and
<application>CVSup</application> use the <emphasis>pull</emphasis>
model of updating sources. In the case of
- <application>CVSup</application> the user (or a
+ <application>CVSup</application> the user (or a
<command>cron</command> script) invokes
the <command>cvsup</command> program, and it interacts with a
<command>cvsupd</command> server somewhere to bring your files
@@ -504,12 +550,11 @@
of interest to you. Updates are generated on the fly by the server,
according to what you have and what you want to have.
<application>Anonymous CVS</application> is quite a bit more
- simplistic than <application>CVSup</application> in that it is just an extension to
- <application>CVS</application> which allows it to pull changes
- directly from a remote CVS repository.
+ simplistic than <application>CVSup</application> in that it is just an
+ extension to <application>CVS</application> which allows it to pull
+ changes directly from a remote CVS repository.
<application>CVSup</application> can do this far more efficiently,
- but <application>Anonymous CVS</application> is easier to
- use.</para>
+ but <application>Anonymous CVS</application> is easier to use.</para>
<indexterm>
<primary><application>CTM</application></primary>
@@ -535,8 +580,10 @@
<application>CTM</application> will not do this, and if you wipe some
portion of your source tree out (and do not have it backed up) then
you will have to start from scratch (from the most recent CVS
- <quote>base delta</quote>) and rebuild it all with <application>CTM</application> or, with
- <application>Anonymous CVS</application>, simply delete the bad bits and resync.</para>
+ <quote>base delta</quote>) and rebuild it all with
+ <application>CTM</application> or, with
+ <application>Anonymous CVS</application>, simply delete the bad bits
+ and resync.</para>
</sect1>
<sect1 id="makeworld">
@@ -547,8 +594,7 @@
</indexterm>
<para>Once you have synchronized your local source tree against a
particular version of &os; (&os.stable;, &os.current;, and so on)
- you can then use the source
- tree to rebuild the system.</para>
+ you can then use the source tree to rebuild the system.</para>
<warning>
<title>Make a Backup</title>
@@ -561,9 +607,8 @@
source tree render your system unbootable.</para>
<para>Make sure you have taken a backup. And have a fixit floppy or
- bootable CD at
- hand. You will probably never have to use it, but it is better to be
- safe than sorry!</para>
+ bootable CD at hand. You will probably never have to use it, but it
+ is better to be safe than sorry!</para>
</warning>
<warning>
@@ -581,15 +626,14 @@
file systems (or worse).</para>
<para>If problems like these occur, a <quote>heads up</quote> is
- posted to the appropriate mailing list, explaining the nature of
+ posted to the appropriate mailing list, explaining the nature of
the problem and which systems it affects. And an <quote>all
clear</quote> announcement is posted when the problem has been
solved.</para>
<para>If you try to track &os.stable; or &os.current; and do
- not read the &a.stable; or the
- &a.current; respectively, then you are
- asking for trouble.</para>
+ not read the &a.stable; or the &a.current; respectively, then you
+ are asking for trouble.</para>
</warning>
<warning>
@@ -611,10 +655,11 @@
necessary for your version of the sources and then use the following
procedure:</para>
- <screen>&prompt.root; <userinput>make buildworld</userinput>
+ <screen>&prompt.root; <userinput>cd /usr/src</userinput>
+&prompt.root; <userinput>make buildworld</userinput>
&prompt.root; <userinput>make buildkernel</userinput>
&prompt.root; <userinput>make installkernel</userinput>
-&prompt.root; <userinput>reboot</userinput></screen>
+&prompt.root; <userinput>shutdown -r now</userinput></screen>
<note>
<para>There are a few rare cases when an extra run of
@@ -630,7 +675,9 @@
(i.e. using <command>boot -s</command> from the loader
prompt). Then run:</para>
- <screen>&prompt.root; <userinput>mergemaster -p</userinput>
+ <screen>&prompt.root; <userinput>mount -a -t ufs</userinput>
+&prompt.root; <userinput>mergemaster -p</userinput>
+&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput>
&prompt.root; <userinput>mergemaster</userinput>
&prompt.root; <userinput>reboot</userinput></screen>
@@ -658,8 +705,8 @@
<important>
<para>Reading <filename>UPDATING</filename> is not an acceptable
- substitute for subscribing to the correct mailing list, as described
- previously. The two requirements are complementary, not
+ substitute for subscribing to the correct mailing list, as
+ described previously. The two requirements are complementary, not
exclusive.</para>
</important>
</sect2>
@@ -667,12 +714,11 @@
<sect2>
<title>Check <filename>/etc/make.conf</filename></title>
<indexterm>
- <primary><filename>make.conf</filename></primary>
+ <primary><filename>make.conf</filename></primary>
</indexterm>
<para>Examine the files
- <filename>/usr/share/examples/etc/make.conf</filename>
- and
+ <filename>/usr/share/examples/etc/make.conf</filename> and
<filename>/etc/make.conf</filename>. The first contains some
default defines – most of which are commented out. To
make use of them when you rebuild your system from source, add
@@ -685,10 +731,9 @@
<makevar>CFLAGS</makevar> and
<makevar>NO_PROFILE</makevar> lines found in
<filename>/usr/share/examples/etc/make.conf</filename>
- to
- <filename>/etc/make.conf</filename> and uncomment them.</para>
+ to <filename>/etc/make.conf</filename> and uncomment them.</para>
- <para>Examine the other definitions (<makevar>COPTFLAGS</makevar>,
+ <para>Examine the other definitions (<makevar>COPTFLAGS</makevar>,
<makevar>NOPORTDOCS</makevar> and so
on) and decide if they are relevant to you.</para>
</sect2>
@@ -706,15 +751,14 @@
<filename>/etc/group</filename>.</para>
<para>There have been occasions when the installation part of
- <command>make installworld</command> has expected certain usernames or groups
- to exist. When performing an upgrade it is likely that these
- users or groups did not exist. This caused problems when upgrading.
- In some cases <command>make buildworld</command> will check to see if
- these users or groups exist.</para>
+ <command>make installworld</command> has expected certain usernames
+ or groups to exist. When performing an upgrade it is likely that
+ these users or groups did not exist. This caused problems when
+ upgrading. In some cases <command>make buildworld</command> will
+ check to see if these users or groups exist.</para>
- <para>An example of this is when the
- <username>smmsp</username> user was added. Users had the
- installation process fail for them when
+ <para>An example of this is when the <username>smmsp</username> user
+ was added. Users had the installation process fail for them when
&man.mtree.8; was trying to create
<filename>/var/spool/clientmqueue</filename>.</para>
@@ -757,9 +801,9 @@
<indexterm><primary>multi-user mode</primary></indexterm>
<para>Another method is to compile the system in multi-user mode, and
- then drop into single user mode for the installation. If you would
- like to do it this way, simply hold off on the following steps until
- the build has completed. You can postpone dropping to single user
+ then drop into single user mode for the installation. If you would
+ like to do it this way, simply hold off on the following steps until
+ the build has completed. You can postpone dropping to single user
mode until you have to <maketarget>installkernel</maketarget> or
<maketarget>installworld</maketarget>.</para>
@@ -771,8 +815,8 @@
mode.</para>
<para>Alternatively, reboot the system, and at the boot prompt,
- select the <quote>single user</quote> option. The system will then boot
- single user. At the shell prompt you should then run:</para>
+ select the <quote>single user</quote> option. The system will then
+ boot single user. At the shell prompt you should then run:</para>
<screen>&prompt.root; <userinput>fsck -p</userinput>
&prompt.root; <userinput>mount -u /</userinput>
@@ -783,20 +827,18 @@
read/write, mounts all the other UFS file systems referenced in
<filename>/etc/fstab</filename> and then turns swapping on.</para>
+ <note>
+ <para>If your CMOS clock is set to local time and not to GMT
+ (this is true if the output of the &man.date.1; command
+ does not show the correct time and zone),
+ you may also need to run the following command:</para>
- <note>
- <para>If your CMOS clock is set to local time and not to GMT
- (this is true if the output of the &man.date.1; command
- does not show the correct time and zone),
- you may also need to run the following command:</para>
-<screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
+ <screen>&prompt.root; <userinput>adjkerntz -i</userinput></screen>
- <para>This will make sure that your local time-zone settings
- get set up correctly — without this, you may later run into some
- problems.
- </para>
- </note>
-
+ <para>This will make sure that your local time-zone settings
+ get set up correctly — without this, you may later run
+ into some problems.</para>
+ </note>
</sect2>
<sect2>
@@ -807,8 +849,8 @@
<filename>/usr/obj</filename>. The directories shadow those under
<filename>/usr/src</filename>.</para>
- <para>You can speed up the <command>make buildworld</command> process, and
- possibly save yourself some dependency headaches by removing this
+ <para>You can speed up the <command>make buildworld</command> process,
+ and possibly save yourself some dependency headaches by removing this
directory as well.</para>
<para>Some files below <filename>/usr/obj</filename> may have the
@@ -839,9 +881,9 @@
when the process has finished.</para>
<screen>&prompt.root; <userinput>script /var/tmp/mw.out</userinput>
-Script started, output file is /var/tmp/mw.out
+Script started, output file is /var/tmp/mw.out
&prompt.root; <userinput>make TARGET</userinput>
-<emphasis>… compile, compile, compile …</emphasis>
+<emphasis>… compile, compile, compile …</emphasis>
&prompt.root; <userinput>exit</userinput>
Script done, …</screen>
@@ -865,9 +907,9 @@
<indexterm><primary><command>make</command></primary></indexterm>
<para>To rebuild the world you use the &man.make.1; command. This
- command reads instructions from the <filename>Makefile</filename>,
- which describes how the programs that comprise &os; should be
- rebuilt, the order in which they should be built, and so on.</para>
+ command reads instructions from the <filename>Makefile</filename>,
+ which describes how the programs that comprise &os; should be
+ rebuilt, the order in which they should be built, and so on.</para>
<para>The general format of the command line you will type is as
follows:</para>
@@ -891,7 +933,7 @@
<para>is another way of specifying that profiled libraries should
not be built, and corresponds with the</para>
- <programlisting>NO_PROFILE= true # Avoid compiling profiled libraries</programlisting>
+ <programlisting>NO_PROFILE= true # Avoid compiling profiled libraries</programlisting>
<para>line in <filename>/etc/make.conf</filename>.</para>
@@ -907,8 +949,8 @@
sub-steps.</para>
<para>Most of the time you will not need to pass any parameters to
- &man.make.1;, and so your command like will look like
- this:</para>
+ &man.make.1;, and so your command like will look like
+ this:</para>
<screen>&prompt.root; <userinput>make <replaceable>target</replaceable></userinput></screen>
@@ -918,26 +960,27 @@
<para>As the names imply, <maketarget>buildworld</maketarget>
builds a complete new tree under <filename>/usr/obj</filename>,
- and <maketarget>installworld</maketarget>, another target, installs this tree on
- the current machine.</para>
+ and <maketarget>installworld</maketarget>, another target,
+ installs this tree on the current machine.</para>
- <para>Having separate options is very useful for two reasons. First, it allows you
- to do the build safe in the knowledge that no components of
- your running system will be affected. The build is
+ <para>Having separate options is very useful for two reasons. First,
+ it allows you to do the build safe in the knowledge that no
+ components of your running system will be affected. The build is
<quote>self hosted</quote>. Because of this, you can safely
run <maketarget>buildworld</maketarget> on a machine running
in multi-user mode with no fear of ill-effects. It is still
- recommended that you run the
- <maketarget>installworld</maketarget> part in single user
- mode, though.</para>
+ recommended that you run the <maketarget>installworld</maketarget>
+ part in single user mode, though.</para>
- <para>Secondly, it allows you to use NFS mounts to upgrade
+ <para>Secondly, it allows you to use NFS mounts to upgrade
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list