svn commit: r39997 - in projects/pkgng/en_US.ISO8859-1: articles/committers-guide articles/contributing articles/contributors books/faq books/handbook/basics books/handbook/eresources books/handboo...
Glen Barber
gjb at FreeBSD.org
Thu Nov 15 13:37:21 UTC 2012
Author: gjb
Date: Thu Nov 15 13:37:20 2012
New Revision: 39997
URL: http://svnweb.freebsd.org/changeset/doc/39997
Log:
Merge r39917 through r39993 from ^/head/en_US.ISO8859-1
to pkgng/ branch.
Modified:
projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml
projects/pkgng/en_US.ISO8859-1/articles/contributing/article.xml
projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
projects/pkgng/en_US.ISO8859-1/books/faq/book.xml
projects/pkgng/en_US.ISO8859-1/books/handbook/basics/chapter.xml
projects/pkgng/en_US.ISO8859-1/books/handbook/eresources/chapter.xml
projects/pkgng/en_US.ISO8859-1/books/handbook/geom/chapter.xml
projects/pkgng/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml
projects/pkgng/en_US.ISO8859-1/books/porters-handbook/book.xml
projects/pkgng/en_US.ISO8859-1/htdocs/art.xml
projects/pkgng/en_US.ISO8859-1/htdocs/cgi/man.cgi
projects/pkgng/en_US.ISO8859-1/htdocs/internal/homepage.pl
projects/pkgng/en_US.ISO8859-1/htdocs/search/sitemap.xml
projects/pkgng/en_US.ISO8859-1/share/xml/mailing-lists.ent
projects/pkgng/en_US.ISO8859-1/share/xml/release.l10n.ent
Directory Properties:
projects/pkgng/en_US.ISO8859-1/ (props changed)
Modified: projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml
==============================================================================
--- projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml Thu Nov 15 07:41:34 2012 (r39996)
+++ projects/pkgng/en_US.ISO8859-1/articles/committers-guide/article.xml Thu Nov 15 13:37:20 2012 (r39997)
@@ -370,7 +370,7 @@
<sect2 id="svn-getting-started">
<title>Getting Started</title>
- <para>There are three ways to obtain a working copy of the tree
+ <para>There are a few ways to obtain a working copy of the tree
from Subversion. This section will explain them.</para>
<sect3>
@@ -466,119 +466,6 @@
information on how to set one up.</para>
</sect3>
- <sect3>
- <title>Checkout from a Local Mirror Using
- <acronym>SVK</acronym></title>
-
- <para>The third alternative is to use <acronym>SVK</acronym>
- to maintain a local mirror. It is a version control system
- build on top of Subversion's storage engine. It is
- identical to Subversion in most respects, except that it
- allows for setting up parts of repositories as mirrors of
- other repositories, and keeping local branches for merging
- back into the upstream repositories. There are extensions
- that allow <acronym>SVK</acronym> to mirror
- Perforce repositories in addition
- to Subversion ones.</para>
-
- <para>Like everything, <acronym>SVK</acronym> has its
- disadvantages, one being that local revision numbers will
- not match upstream revision numbers. This makes it
- difficult to <command>svk log</command>, <command>svk
- diff</command>, or <command>svk update</command> to an
- arbitrary upstream revision.</para>
-
- <para>To set up a mirror of the &os; repository, do:</para>
-
- <screen>&prompt.user; <userinput>svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base</userinput></screen>
-
- <para>The local <acronym>SVK</acronym> repository will be
- stored in <filename
- class="directory">~/.svk/local/</filename>, but can be
- moved to an alternate location. If it is moved,
- <filename>~/.svk/config</filename> should be amended
- manually to reflect the move.</para>
-
- <para>Any path can be used, not just the one in the example
- above. A common pattern is to place mirrors under
- <literal>//mirror</literal>, e.g.,
- <filename
- class="directory">//mirror/freebsd/base/</filename>, and
- local branches under <literal>//local</literal>.</para>
-
- <para>To pull down the contents of the repository to the
- mirror:</para>
-
- <screen>&prompt.user; <userinput>svk sync //freebsd/base</userinput></screen>
-
- <note>
- <para><command>svk sync</command> will take a very long
- time, possibly several days over a slow network
- connection. &a.peter; has a tarball that can be used to
- jumpstart the mirror, but only if one does not exist
- already.</para>
- </note>
-
- <para>To use the tarball referenced above:</para>
-
- <screen>&prompt.user; <userinput>cd ~</userinput>
-&prompt.user; <userinput>scp freefall:/home/peter/dot_svk_r179646.tbz2 .</userinput>
-&prompt.user; <userinput>tar xf dot_svk_r179646.tbz2</userinput></screen>
-
- <para>Then edit <filename>~/.svk/config</filename> and replace
- <filename
- class="directory">/scratch/tmp/peter/.svk/local/</filename>
- with the equivalent of <filename
- class="directory">/home/<replaceable>jarjar</replaceable>/.svk/local/</filename>.</para>
-
- <para>You can check out files directly from your mirror, once
- it has been created:</para>
-
- <screen>&prompt.user; <userinput>svk checkout //freebsd/base/head /usr/src</userinput></screen>
-
- <para>Unlike <acronym>SVN</acronym>, <acronym>SVK</acronym>
- does not store metadata or reference copies in the working
- copy. All metadata is recorded in
- <filename>~/.svk/config</filename>; reference copies are not
- used at all because <acronym>SVK</acronym> always operates
- on a local repository.</para>
-
- <para>When committing from a working copy like the one above,
- <acronym>SVN</acronym> will commit directly to the upstream
- repository, then synchronise the mirror.</para>
-
- <para>However, the <quote>killer app</quote> for
- <acronym>SVK</acronym> is the ability to work without a
- network connection. To do that, a local branch must be set
- up:</para>
-
- <screen>&prompt.user; <userinput>svk mkdir //local/freebsd</userinput>
-&prompt.user; <userinput>svk copy //freebsd/base/head //local/freebsd/head</userinput></screen>
-
- <para>Once again, any path can be used, it does not have to
- specifically be the one in the example.</para>
-
- <para>Before use, the local branch has to be synchronized,
- like so:</para>
-
- <screen>&prompt.user; <userinput>svk pull //local/freebsd/head</userinput></screen>
-
- <para>Then check out from the newly created local
- branch:</para>
-
- <screen>&prompt.user; <userinput>svk checkout //local/freebsd/head /usr/src</userinput></screen>
-
- <para>The point of this exercise is showing that it is
- possible to commit work-in-progress to a local branch, and
- only push it to the upstream repository when work is
- complete. The easy way to push is with <command>svk
- push</command>, but there is a serious disadvantage to it:
- it will push every single commit made to the local branch
- incrementally instead of lumping them all into a single
- commit. Therefore, using <command>svk smerge</command> is
- preferable.</para>
- </sect3>
-
<sect3 id="subversion-primer-base-layout">
<title><literal>RELENG_*</literal> Branches and General
Layout</title>
Modified: projects/pkgng/en_US.ISO8859-1/articles/contributing/article.xml
==============================================================================
--- projects/pkgng/en_US.ISO8859-1/articles/contributing/article.xml Thu Nov 15 07:41:34 2012 (r39996)
+++ projects/pkgng/en_US.ISO8859-1/articles/contributing/article.xml Thu Nov 15 13:37:20 2012 (r39997)
@@ -342,39 +342,22 @@
<para>The preferred &man.diff.1; format for submitting patches
is the unified output format generated by <command>diff
- -u</command>. However, for patches that substantially
- change a region of code, a context output format diff
- generated by <command>diff -c</command> may be more readable
- and thus preferable.</para>
+ -u</command>.</para>
<indexterm>
<primary><command>diff</command></primary>
</indexterm>
- <para>For example:</para>
-
- <screen>&prompt.user; <userinput>diff -c oldfile newfile</userinput></screen>
-
- <para>or</para>
-
- <screen>&prompt.user; <userinput>diff -c -r olddir newdir</userinput></screen>
-
- <para>would generate such a set of context diffs for the given
- source file or directory hierarchy.</para>
-
- <para>Likewise,</para>
-
<screen>&prompt.user; <userinput>diff -u oldfile newfile</userinput></screen>
<para>or</para>
- <screen>&prompt.user; <userinput>diff -u -r olddir newdir</userinput></screen>
+ <screen>&prompt.user; <userinput>diff -u -r -N olddir newdir</userinput></screen>
- <para>would do the same, except in the unified diff
- format.</para>
+ <para>would generate a set of unified diffs for the given source
+ file or directory hierarchy.</para>
- <para>See the manual page for &man.diff.1; for more
- details.</para>
+ <para>See &man.diff.1; for more information.</para>
<para>Once you have a set of diffs (which you may test with the
&man.patch.1; command), you should submit them for inclusion
@@ -400,9 +383,8 @@
welcome.</para>
<para>If your change is of a potentially sensitive nature,
- e.g. you are unsure of copyright issues governing its further
- distribution or you are simply not ready to release it without
- a tighter review first, then you should send it to &a.core;
+ such as if you are unsure of copyright issues governing its further
+ distribution then you should send it to &a.core;
directly rather than submitting it with &man.send-pr.1;. The
&a.core; reaches a much smaller group of people who
do much of the day-to-day work on FreeBSD. Note that this
@@ -506,7 +488,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- $Id$</programlisting>
+ $&os;$</programlisting>
<para>For your convenience, a copy of this text can be found in
<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>
@@ -565,16 +547,6 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE PO
<ulink url="&url.base;/donations/">Donations Liaison
Office</ulink>.</para>
</sect3>
-
- <sect3>
- <title>Donating Internet Access</title>
-
- <para>We can always use new mirror sites for FTP, WWW or
- <command>cvsup</command>. If you would like to be such a
- mirror, please see the
- <ulink url="&url.articles.hubs;/index.html">Mirroring
- FreeBSD</ulink> article for more information.</para>
- </sect3>
</sect2>
</sect1>
Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml
==============================================================================
--- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Thu Nov 15 07:41:34 2012 (r39996)
+++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Thu Nov 15 13:37:20 2012 (r39997)
@@ -1722,6 +1722,11 @@
</listitem>
<listitem>
+ <para>Christian Heckendorf
+ <email>heckend at bu.edu</email></para>
+ </listitem>
+
+ <listitem>
<para>Christian Lackas
<email>delta at lackas.net</email></para>
</listitem>
@@ -3595,11 +3600,6 @@
</listitem>
<listitem>
- <para>Grzegorz Blach
- <email>magik at roorback.net</email></para>
- </listitem>
-
- <listitem>
<para>Guillaume Paquet
<email>amyfoub at videotron.ca</email></para>
</listitem>
Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Thu Nov 15 07:41:34 2012 (r39996)
+++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Thu Nov 15 13:37:20 2012 (r39997)
@@ -116,6 +116,10 @@
</listitem>
<listitem>
+ <para>&a.gblach;</para>
+ </listitem>
+
+ <listitem>
<para>&a.mbr;</para>
</listitem>
@@ -1520,6 +1524,10 @@
</listitem>
<listitem>
+ <para>&a.bryanv;</para>
+ </listitem>
+
+ <listitem>
<para>&a.avilla;</para>
</listitem>
Modified: projects/pkgng/en_US.ISO8859-1/books/faq/book.xml
==============================================================================
--- projects/pkgng/en_US.ISO8859-1/books/faq/book.xml Thu Nov 15 07:41:34 2012 (r39996)
+++ projects/pkgng/en_US.ISO8859-1/books/faq/book.xml Thu Nov 15 13:37:20 2012 (r39997)
@@ -143,8 +143,7 @@
<para>For more detailed information on &os;, please see the
<ulink
- url="&url.books.handbook;/index.html">&os; Handbook</ulink>.
- </para>
+ url="&url.books.handbook;/index.html">&os; Handbook</ulink>.</para>
</answer>
</qandaentry>
@@ -154,32 +153,11 @@
</question>
<answer>
- <para>The goal of the &os; Project is to provide software that
- may be used for any purpose and without strings attached.
- Many of us have a significant investment in the code (and
- project) and would certainly not mind a little financial
- compensation now and then, but we definitely do not insist
- on it. We believe that our first and foremost
- <quote>mission</quote> is to provide code to any and all
- comers, and for whatever purpose, so that the code gets the
- widest possible use and provides the widest possible
- benefit. This is, we believe, one of the most fundamental
- goals of Free Software and one that we enthusiastically
- support.</para>
-
- <para>That code in our source tree which falls under the
- <ulink
- url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public License (GPL)</ulink>
- or <ulink
- url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library General Public License (LGPL)</ulink>
- comes with slightly more strings attached, though at least
- on the side of enforced access rather than the usual
- opposite. Due to the additional complexities that can
- evolve in the commercial use of GPL software, we do,
- however, endeavor to replace such software with submissions
- under the more relaxed <ulink
- url="http://www.FreeBSD.org/copyright/freebsd-license.html">&os; license</ulink>
- whenever possible.</para>
+ <para>The goal of the &os; Project is to provide a
+ stable and fast general purpose
+ operating system that may
+ be used for any purpose
+ without strings attached.</para>
</answer>
</qandaentry>
@@ -205,6 +183,34 @@
<para>Do not sue us if it breaks.</para>
</listitem>
</itemizedlist>
+
+ <para>Many of us have a significant investment in the
+ project
+ and would certainly not mind a little financial
+ compensation now and then, but we definitely do not insist
+ on it. We believe that our first and foremost
+ <quote>mission</quote> is to provide code to any and all
+ comers, and for whatever purpose, so that the code gets
+ the
+ widest possible use and provides the widest possible
+ benefit. This, we believe, is one of the most
+ fundamental
+ goals of Free Software and one that we enthusiastically
+ support.</para>
+
+ <para>Code in our source tree which falls under the
+ <ulink
+ url="http://www.FreeBSD.org/copyright/COPYING">GNU General Public License (GPL)</ulink>
+ or <ulink
+ url="http://www.FreeBSD.org/copyright/COPYING.LIB">GNU Library General Public License (LGPL)</ulink>
+ comes with slightly more strings attached, though at least
+ on the side of enforced access rather than the usual
+ opposite. Due to the additional complexities that can
+ evolve in the commercial use of GPL software, we do,
+ however, endeavor to replace such software with submissions
+ under the more relaxed <ulink
+ url="http://www.FreeBSD.org/copyright/freebsd-license.html">&os; license</ulink>
+ whenever possible.</para>
</answer>
</qandaentry>
@@ -226,8 +232,7 @@
network servers, and just about everything else you might
want. Most of these applications can be managed through the
<ulink
- url="http://www.FreeBSD.org/ports/">Ports Collection</ulink>.
- </para>
+ url="http://www.FreeBSD.org/ports/">Ports Collection</ulink>.</para>
<para>If you need to use an application that is only available
on one operating system, you simply cannot replace that
@@ -243,7 +248,7 @@
<para>If you are migrating to &os; from some other &unix;
environment, you already know most of what you need to. If
your background is in graphic-driven operating systems such
- as &windows; and older versions of &macos;, expect to invest
+ as &windows; and &macos;, expect to invest
additional time learning the &unix; way of doing things.
This FAQ and the <ulink
url="&url.books.handbook;/index.html">&os; Handbook</ulink>
@@ -371,12 +376,12 @@
<answer>
<para><ulink
- url="&url.books.handbook;/current-stable.html#CURRENT">&os.current;</ulink>
+ url="&url.books.handbook;/current-stable.html#current">&os.current;</ulink>
is the development version of the operating system, which
will in due course become the new &os.stable; branch. As
such, it is really only of interest to developers working on
the system and die-hard hobbyists. See the <ulink
- url="&url.books.handbook;/current-stable.html#CURRENT">relevant section</ulink>
+ url="&url.books.handbook;/current-stable.html#current">relevant section</ulink>
in the <ulink
url="&url.books.handbook;/index.html">Handbook</ulink> for
details on running <emphasis>-CURRENT</emphasis>.</para>
@@ -436,15 +441,13 @@
<emphasis>-STABLE</emphasis> snapshots.</para>
<para>Snapshot releases are directly available from <ulink
- url="&url.base;/snapshots/">snapshot</ulink>.
- </para>
+ url="&url.base;/snapshots/">snapshot</ulink>.</para>
<para>Official snapshots are generated each month on a regular
basis for all actively developed branches. There are also
daily snapshot builds of the popular &arch.i386; and
&arch.amd64; branches, hosted on <ulink
- url="http://snapshots.us.freebsd.org/"></ulink>.
- </para>
+ url="http://snapshots.us.freebsd.org/"></ulink>.</para>
</answer>
</qandaentry>
@@ -457,9 +460,9 @@
<answer>
<para>Back when &os; 2.0.5 was released, &os; development
branched in two. One branch was named <ulink
- url="&url.books.handbook;/current-stable.html#STABLE">-STABLE</ulink>,
+ url="&url.books.handbook;/current-stable.html#stable">-STABLE</ulink>,
one <ulink
- url="&url.books.handbook;/current-stable.html#CURRENT">-CURRENT</ulink>.
+ url="&url.books.handbook;/current-stable.html#current">-CURRENT</ulink>.
<emphasis>&os;-STABLE</emphasis> is intended for Internet
Service Providers and other commercial enterprises for whom
sudden shifts or experimental features are quite
@@ -472,8 +475,7 @@
url="&url.articles.releng;/release-proc.html#REL-BRANCH">&os; Release Engineering: Creating the Release Branch</ulink></quote>,
the status of the branches and the upcoming release schedule
can be found on the <ulink
- url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.
- </para>
+ url="http://www.FreeBSD.org/releng">Release Engineering Information</ulink> page.</para>
<para>The 2.2-STABLE branch was retired with the release of
2.2.8. The 3-STABLE branch has ended with the release of
@@ -542,7 +544,7 @@
url="&url.base;/administration.html#t-core">core team</ulink> of
9 people. There is a much larger team of more than 350
<ulink
- url="&url.articles.contributors;/article.html#STAFF-COMMITTERS">committers</ulink>
+ url="&url.articles.contributors;/article.html#staff-committers">committers</ulink>
who are authorized to make changes directly to the &os;
source tree.</para>
@@ -561,15 +563,13 @@
<answer>
<para>Every significant release of &os; is available via
anonymous FTP from the <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/"> &os; FTP site</ulink>:
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/"> &os; FTP site</ulink>:</para>
<itemizedlist>
<listitem>
<para>The latest &rel.stable; release, &rel.current;-RELEASE
can be found in the <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
</listitem>
<listitem>
@@ -584,22 +584,19 @@
<listitem>
<para>The latest &rel2.stable; release, &rel2.current;-RELEASE
can be found in the <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;-RELEASE directory</ulink>.</para>
</listitem>
<listitem>
<para>The latest &rel3.stable; release, &rel3.current;-RELEASE
can be found in the <ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel3.current;-RELEASE/">&rel3.current;-RELEASE directory</ulink>.
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel3.current;-RELEASE/">&rel3.current;-RELEASE directory</ulink>.</para>
</listitem>
</itemizedlist>
<para>Information about obtaining &os; on CD, DVD, and other
media can be found in <ulink
- url="&url.books.handbook;/mirrors.html">the Handbook</ulink>.
- </para>
+ url="&url.books.handbook;/mirrors.html">the Handbook</ulink>.</para>
</answer>
</qandaentry>
@@ -908,15 +905,14 @@
</listitem>
<listitem>
- <para>The compression and packaging scheme. There are
- three of these currently in use.</para>
+ <para>The compression and packaging scheme.</para>
<orderedlist>
<listitem>
<para>Where the format is
<literal>html-split</literal>, the files are bundled
up using &man.tar.1;. The resulting
- <filename>.tar</filename> file is then compressed
+ <filename>.tar</filename> is then compressed
using the compression schemes detailed in the next
point.</para>
</listitem>
@@ -927,42 +923,11 @@
(i.e., <filename>article.pdf</filename>,
<filename>book.html</filename>, and so on).</para>
- <para>These files are then compressed using two
- compression schemes.</para>
-
- <informaltable frame="none" pgwide="1">
- <tgroup cols="2">
- <thead>
- <row>
- <entry>Scheme</entry>
-
- <entry>Description</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry><literal>zip</literal></entry>
-
- <entry>The <literal>zip</literal> format. If you want to
- uncompress this on &os; you will need to
- install the <filename
- role="package">archivers/unzip</filename>
- port first.</entry>
- </row>
-
- <row>
- <entry><literal>bz2</literal></entry>
-
- <entry>The <literal>bzip2</literal> format. Less widespread than
- <literal>zip</literal>, but generally gives smaller files.
- Install the <filename
- role="package">archivers/bzip2</filename>
- port to uncompress these files.</entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
+ <para>These files are then compressed using either
+ the <literal>zip</literal> or
+ <literal>bz2</literal> compression schemes.
+ &man.tar.1; can be used to uncompress these
+ files.</para>
<para>So the &postscript; version of the Handbook,
compressed using <literal>bzip2</literal> will be stored in a file
@@ -979,14 +944,13 @@
appropriate documents into place.</para>
<para>For example, the split HTML version of the FAQ,
- compressed using &man.bzip2.1;, can be found in the
+ compressed using &man.bzip2.1;, can be found in
<filename>doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</filename>
- file. To download and uncompress that file you would have
+ To download and uncompress that file you would have
to do this.</para>
<screen>&prompt.root; <userinput>fetch ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/en_US.ISO8859-1/books/faq/book.html-split.tar.bz2</userinput>
-&prompt.root; <userinput>bzip2 -d book.html-split.tar.bz2</userinput>
-&prompt.root; <userinput>tar xvf book.html-split.tar</userinput></screen>
+&prompt.root; <userinput>tar xvf book.html-split.tar.bz2</userinput></screen>
<para>You will be left with a collection of
<filename>.html</filename> files. The main one is called
@@ -1004,7 +968,7 @@
<answer>
<para>You can find full information in the <ulink
- url="&url.books.handbook;/eresources.html#ERESOURCES-MAIL">Handbook entry on mailing-lists</ulink>.</para>
+ url="&url.books.handbook;/eresources.html#eresources-mail">Handbook entry on mailing-lists</ulink>.</para>
</answer>
</qandaentry>
@@ -1140,8 +1104,7 @@
<para>BSD Certification Group, Inc. provides system
administration certifications for DragonFly BSD, &os;, NetBSD,
OpenBSD. If you are interested in them, visit <ulink
- url="http://www.BSDCertification.org">their site</ulink>.
- </para>
+ url="http://www.BSDCertification.org">their site</ulink>.</para>
<para>Any other organizations providing training and support
should contact the Project in order to be listed here.</para>
@@ -1168,7 +1131,7 @@
<qandaentry>
<question id="which-architecture">
<para>Which platform should I download? I have a 64
- bit capable Intel CPU,
+ bit capable &intel; CPU,
but I only see <literal>amd64</literal>.</para>
</question>
@@ -1245,8 +1208,7 @@
<para>Full instructions on this procedure and a little bit
more about installation issues in general can be found in
the <ulink
- url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.
- </para>
+ url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para>
</answer>
</qandaentry>
@@ -1295,8 +1257,7 @@
it to the floppy <quote>raw</quote>, using the low-level
tools (e.g., <command>fdimage</command> or
<command>rawrite</command>) described in the <ulink
- url="&url.books.handbook;/install.html">installation guide to &os;</ulink>.
- </para>
+ url="&url.books.handbook;/install.html">installation guide to &os;</ulink>.</para>
</listitem>
</itemizedlist>
</answer>
@@ -1309,8 +1270,7 @@
<answer>
<para>Installation instructions can be found in the <ulink
- url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.
- </para>
+ url="&url.books.handbook;/install.html">Handbook entry on installing &os;</ulink>.</para>
</answer>
</qandaentry>
@@ -1816,8 +1776,7 @@
<para>Memory limits depend on the platform used. On a
standard &i386; install, the limit is 4 GB but more
memory can be supported through &man.pae.4;. See <link
- linkend="memory-i386-over-4gb">instructions for using 4 GB or more memory on &i386;</link>.
- </para>
+ linkend="memory-i386-over-4gb">instructions for using 4 GB or more memory on &i386;</link>.</para>
<para>&os;/pc98 has a limit of 4 GB memory, and PAE can
not be used with it. Other architectures supported by &os;
@@ -2087,8 +2046,8 @@
</question>
<answer>
- <para>Yes. &os; currently runs on the Intel x86 and the
- AMD64 architectures. The Intel EM64T, IA-64, &arm;,
+ <para>Yes. &os; currently runs on the &intel; x86 and the
+ AMD64 architectures. The &intel; EM64T, IA-64, &arm;,
&powerpc;, and &sparc64; architectures are also
supported. Upcoming platforms are &mips; and &s390;, join
the &a.mips; for more information about ongoing work on
@@ -2138,6 +2097,7 @@
Install <filename role="package">sysutils/devcpu-data</filename>,
then add:</para>
<programlisting>microcode_update_enable="YES"</programlisting>
+
<para>to <filename>/etc/rc.conf</filename></para>
</answer>
</qandaentry>
@@ -2172,8 +2132,7 @@
<para>See the complete list in the Hardware Notes for &os;
<ulink url="&rel.current.hardware;">&rel.current;</ulink>
or <ulink
- url="&rel2.current.hardware;">&rel2.current;</ulink>.
- </para>
+ url="&rel2.current.hardware;">&rel2.current;</ulink>.</para>
</answer>
</qandaentry>
@@ -2234,7 +2193,7 @@
drive. See &man.burncd.8; for details.</para>
<para>&os; also supports any SCSI CD-R or CD-RW drives.
- Install and use the <command>cdrecord</command> command
+ Install and use <command>cdrecord</command>
from the ports or packages system, and make sure that you
have the <devicename>pass</devicename> device compiled in
your kernel.</para>
@@ -2440,8 +2399,7 @@
<para>For the possible usage of wheels in the X Window
environment, refer to <link
- linkend="x-and-wheel">that section</link>.
- </para>
+ linkend="x-and-wheel">that section</link>.</para>
</answer>
</qandaentry>
@@ -2479,8 +2437,7 @@ bind ^[[3~ ed-delete-next-char # for xte
bindkey ^[[3~ delete-char # for xterm</programlisting>
<para>For more information, see <ulink
- url="http://www.ibb.net/~anne/keyboard.html">this page</ulink>.
- </para>
+ url="http://www.ibb.net/~anne/keyboard.html">this page</ulink>.</para>
</answer>
</qandaentry>
</qandaset>
@@ -2540,8 +2497,7 @@ bindkey ^[[3~ delete-char # for xterm</p
<answer>
<para>See <ulink
- url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.
- </para>
+ url="&url.books.handbook;/serialconsole-setup.html">this section of the handbook</ulink>.</para>
</answer>
</qandaentry>
</qandaset>
@@ -2722,8 +2678,7 @@ ARRE (Auto Read Reallocation Enbld): 1<
address range clash :), by bumping the kernel option
<literal>EISA_SLOTS</literal> to a value of 12. Configure
and compile a kernel, as described in the <ulink
- url="&url.books.handbook;/kernelconfig.html">Handbook entry on configuring the kernel</ulink>.
- </para>
+ url="&url.books.handbook;/kernelconfig.html">Handbook entry on configuring the kernel</ulink>.</para>
<para>Of course, this does present you with a chicken-and-egg
problem when installing on such a machine. In order to work
@@ -2744,9 +2699,8 @@ quit</programlisting>
<note>
<para>You cannot use a <literal>dangerously
- dedicated</literal> disk with an HP Netserver. See <link
- linkend="dedicate">this note</link> for more info.
- </para>
+ dedicated</literal> disk with an HP Netserver. See <link
+ linkend="dedicate">this note</link> for more info.</para>
</note>
</answer>
</qandaentry>
@@ -2759,8 +2713,8 @@ quit</programlisting>
<answer>
<para>This is usually caused by an interrupt conflict (e.g.,
- two boards using the same IRQ). Boot with the
- <option>-c</option> option and change the
+ two boards using the same IRQ). Boot with
+ <option>-c</option> and change the
<devicename>ed0</devicename>/<devicename>de0</devicename>/...
entry to match your board.</para>
@@ -2899,8 +2853,7 @@ quit</programlisting>
instructions to send a problem report.</para>
<para>There is an extensive FAQ on this at <ulink
- url="http://www.bitwizard.nl/sig11/">the SIG11 problem FAQ</ulink>.
- </para>
+ url="http://www.bitwizard.nl/sig11/">the SIG11 problem FAQ</ulink>.</para>
</answer>
</qandaentry>
@@ -3017,7 +2970,7 @@ quit</programlisting>
memory for network buffers (specifically, mbuf clusters).
You can increase the amount of VM available for mbuf
clusters by following the instructions in the <ulink
- url="&url.books.handbook;/configtuning-kernel-limits.html#NMBCLUSTERS">Network Limits</ulink>
+ url="&url.books.handbook;/configtuning-kernel-limits.html#nmbclusters">Network Limits</ulink>
section of the Handbook.</para>
</answer>
</qandaentry>
@@ -3136,8 +3089,7 @@ quit</programlisting>
<answer>
<para>You can find a detailed answer for this question in the
<ulink
- url="&url.books.handbook;/mail-trouble.html#Q26.5.2.">Handbook</ulink>.
- </para>
+ url="&url.books.handbook;/mail-trouble.html#Q26.5.2.">Handbook</ulink>.</para>
</answer>
</qandaentry>
@@ -3413,9 +3365,9 @@ chip1 at pci0:31:5: class=0x040100 c
<filename>/etc/resolv.conf</filename>. This will often
cause a delay in <application>SSH</application>, as the
option <literal>UseDNS</literal> is set to
- <literal>yes</literal> by default in the
- <filename>sshd_config</filename> file in
- <filename class="directory">/etc/ssh</filename>. If this is causing the
+ <literal>yes</literal> by default in
+ <filename>/etc/ssh/sshd_config</filename>.
+ If this is causing the
problem, you will either need to fill in the missing
information in <filename>/etc/resolv.conf</filename> or set
<literal>UseDNS</literal> to <literal>no</literal> in
@@ -3448,7 +3400,7 @@ chip1 at pci0:31:5: class=0x040100 c
<varname>MAX_STRAY_LOG</varname> from
<literal>5</literal> to <literal>0</literal> in your
platform's (e.g., &i386;)
- <filename>intr_machdep.c</filename> file and rebuild the
+ <filename>intr_machdep.c</filename> and rebuild the
new kernel and all the warnings will be
suppressed.</para>
</listitem>
@@ -3636,7 +3588,7 @@ kern.timecounter.hardware: TSC -> i82
<para>Enter &man.sysinstall.8; and choose
<guimenuitem>Configure</guimenuitem>, then
<guimenuitem>Fdisk</guimenuitem>. Select the disk the Boot
- Manager resided on with the <keycap>Space</keycap> key.
+ Manager resided on with <keycap>Space</keycap>.
Press <keycap>W</keycap> to write changes to the drive. A
prompt will appear asking which boot loader to install.
Select this, and it will be restored.</para>
@@ -3706,8 +3658,7 @@ kern.timecounter.hardware: TSC -> i82
<answer>
<para>An answer for this question can be found in the &os;
Glossary, see <ulink
- url="&url.books.handbook;/freebsd-glossary.html#LOR-GLOSSARY">LOR</ulink>.
- </para>
+ url="&url.books.handbook;/freebsd-glossary.html#LOR-GLOSSARY">LOR</ulink>.</para>
</answer>
</qandaentry>
@@ -3912,8 +3863,7 @@ kern.timecounter.hardware: TSC -> i82
url="http://www.xfce.org/"><application>xfce</application></ulink>.
<application>KDE</application> and
<application>xfce</application> are both in the <ulink
- url="&url.base;/ports/index.html">ports system</ulink>.
- </para>
+ url="&url.base;/ports/index.html">ports system</ulink>.</para>
</answer>
</qandaentry>
@@ -3996,8 +3946,7 @@ kern.timecounter.hardware: TSC -> i82
<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>
+ 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>
@@ -4006,8 +3955,7 @@ kern.timecounter.hardware: TSC -> i82
<listitem>
<para><ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;</ulink>
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel2.packages;</ulink></para>
</listitem>
</varlistentry>
@@ -4016,8 +3964,7 @@ kern.timecounter.hardware: TSC -> i82
<listitem>
<para><ulink
- url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;</ulink>
- </para>
+ url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;/">ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/i386/&rel.packages;</ulink></para>
</listitem>
</varlistentry>
</variablelist>
@@ -4084,8 +4031,7 @@ kern.timecounter.hardware: TSC -> i82
<answer>
<para>Yes. Please see <ulink
- url="&url.base;/java/index.html">http://www.FreeBSD.org/java/</ulink>.
- </para>
+ url="&url.base;/java/index.html">http://www.FreeBSD.org/java/</ulink>.</para>
</answer>
</qandaentry>
@@ -4268,8 +4214,27 @@ kern.timecounter.hardware: TSC -> i82
<para>The WAV files can then be converted to other formats or
burned onto audio CDs, as described in the <ulink
- url="&url.books.handbook;/creating-cds.html">&os; Handbook</ulink>.
- </para>
+ url="&url.books.handbook;/creating-cds.html">&os; Handbook</ulink>.</para>
+ </answer>
+ </qandaentry>
+
+ <qandaentry>
+ <question id="convert-back-from-pkgng">
+ <para>How can I convert from pkgng to the old package
+ tools?</para>
+ </question>
+
+ <answer>
+ <para>Short answer: it is not possible.</para>
+
+ <para>Longer answer: if you have made any changes using
+ <command>pkg</command> converting back is non-trivial and
+ requires lots of manual editing of internal package
+ database files. However, if you have just run
+ <command>pkg2ng</command> then you may remove
+ <filename>/var/db/pkg/local.sqlite</filename>
+ and extract
+ <filename>/var/backups/pkgdb.bak.tbz</filename>.</para>
</answer>
</qandaentry>
</qandaset>
@@ -4287,8 +4252,7 @@ kern.timecounter.hardware: TSC -> i82
<answer>
<para>Not at all! Check out the <ulink
- url="&url.books.handbook;/kernelconfig.html">kernel config section of the Handbook</ulink>.
- </para>
+ url="&url.books.handbook;/kernelconfig.html">kernel config section of the Handbook</ulink>.</para>
<note>
<para>The new <filename>kernel</filename> will be installed
@@ -4411,8 +4375,8 @@ device sio5 at isa? port 0x2b8 tty flags
used to build the currently running system (e.g., you
are compiling &rel.current;-RELEASE on a
&rel2.current;-RELEASE system). If you are attempting
- an upgrade, please read the
- <filename>/usr/src/UPDATING</filename> file, paying
+ an upgrade, please read
+ <filename>/usr/src/UPDATING</filename>, paying
particular attention to the <quote>COMMON ITEMS</quote>
section at the end.</para>
</listitem>
@@ -4669,8 +4633,8 @@ kern.sched.name: ULE</screen>
<para>When you are slicing up your disk, check that the disk
geometry displayed in the FDISK screen is correct (i.e., it
- matches the BIOS numbers); if it is wrong, use the
- <keycap>G</keycap> key to fix it. You may have to do this
+ matches the BIOS numbers); if it is wrong, use
+ <keycap>G</keycap> to fix it. You may have to do this
if there is absolutely nothing on the disk, or if the disk
has been moved from another system. Note that this is only
an issue with the disk that you are going to boot from; &os;
@@ -4937,7 +4901,7 @@ use "disklabel -r" to install initial la
DOS/&windowsnt; partition. Assuming you name that file
something like <filename>c:\bootsect.bsd</filename>
(inspired by <filename>c:\bootsect.dos</filename>), you can
- then edit the <filename>c:\boot.ini</filename> file to come
+ then edit <filename>c:\boot.ini</filename> to come
up with something like this:</para>
<programlisting>[boot loader]
@@ -5046,8 +5010,7 @@ C:\="DOS"</programlisting>
<programlisting>title &os; 6.1
root <replaceable>(hd0,a)</replaceable>
- kernel /boot/loader
- </programlisting>
+ kernel /boot/loader</programlisting>
<para>Where <replaceable>hd0,a</replaceable> points to your
root partition on the first disk. If you need to specify
@@ -5097,69 +5060,38 @@ C:\="DOS"</programlisting>
</question>
<answer>
- <para>Whether it is a removable drive like a &iomegazip; or an
- EZ drive (or even a floppy, if you want to use it that way),
- or a new hard disk, once it is installed and recognized by
- the system, and you have your cartridge/floppy/whatever
- slotted in, things are pretty much the same for all
- devices.</para>
-
- <para>(this section is based on <ulink
- url="http://www.vmunix.com/mark/FreeBSD/ZIP-FAQ.html">Mark Mayo's ZIP FAQ</ulink>)
- </para>
-
- <para>If it is a ZIP drive or a floppy, you have already got a
- DOS file system on it, you can use a command like this:</para>
-
- <screen>&prompt.root; <userinput>mount -t msdosfs /dev/fd0c /floppy</userinput></screen>
-
- <para>if it is a floppy, or this:</para>
-
- <screen>&prompt.root; <userinput>mount -t msdosfs /dev/da2s4 /zip</userinput></screen>
-
- <para>for a ZIP disk with the factory configuration.</para>
-
- <para>For other disks, see how they are laid out using
- &man.fdisk.8; or &man.sysinstall.8;.</para>
-
- <para>The rest of the examples will be for a ZIP drive on
- <devicename>da2</devicename>, the third SCSI disk.</para>
-
- <para>Unless it is a floppy, or a removable you plan on
- sharing with other people, it is probably a better idea to
- stick a BSD file system on it. You will get long filename
- support, at least a 2X improvement in performance, and a lot
- more stability. First, you need to redo the DOS-level
- partitions/file systems. You can either use &man.fdisk.8;
- or &man.sysinstall.8;, or for a small drive that you do not
- want to bother with multiple operating system support on,
- just blow away the whole FAT partition table (slices) and
- just use the BSD partitioning:</para>
-
- <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/rda2 count=2</userinput>
-&prompt.root; <userinput>disklabel -Brw da2 auto</userinput></screen>
-
- <para>You can use &man.disklabel.8; or &man.sysinstall.8; to
- create multiple BSD partitions. You will certainly want to
- do this if you are adding swap space on a fixed disk, but it
- is probably irrelevant on a removable drive like a
- ZIP.</para>
+ <para>If the drive already has a
+ file system on it, you can use a command like this:</para>
+
+ <screen>&prompt.root; <userinput>mount /dev/da0s1 /mnt</userinput></screen>
- <para>Finally, create a new file system, this one is on our
- ZIP drive using the whole disk:</para>
+ <para>If the drive will only be used with &os;
+ systems it is better idea to
+ stick a BSD file system on it, like UFS or ZFS.
+ You will get long filename
+ support, at least a 2X improvement in performance,
+ and a lot more stability. If the drive will be
+ used by other operating systems a more portable
+ choice, such as msdosfs, is better.</para>
+
+ <screen>&prompt.root; <userinput>dd if=/dev/zero of=/dev/da0 count=2</userinput>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-doc-projects
mailing list