PERFORCE change 149224 for review
Rene Ladan
rene at FreeBSD.org
Thu Sep 4 20:17:10 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=149224
Change 149224 by rene at rene_self on 2008/09/04 20:16:34
IFC (with some help from Remko)
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/des.key#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/lippe.key#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/makc.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#6 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#6 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/yar.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/mirrors.xml#3 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/donations/donors.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/example-Makefile.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/gnome2_porting.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/gnome_porting.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/gnome/docs/porting.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/dists/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/docs/newbies.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/java/news.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/multimedia/multimedia-input.xml#2 integrate
.. //depot/projects/docproj_nl/www/en/news/status/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2008-04-2008-06.xml#1 branch
.. //depot/projects/docproj_nl/www/en/news/status/status.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/releases/6.4R/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/releases/6.4R/docbook.css#1 branch
.. //depot/projects/docproj_nl/www/en/releases/6.4R/schedule.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releases/7.1R/Makefile#1 branch
.. //depot/projects/docproj_nl/www/en/releases/7.1R/docbook.css#1 branch
.. //depot/projects/docproj_nl/www/en/releases/7.1R/schedule.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/releases/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/releng/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/en/smp/index.sgml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/advisories.xml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#3 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.hardware.xml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/press.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/usergroups.xml#2 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#6 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.818 2008/08/16 22:32:57 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.822 2008/09/04 12:22:07 jadawin Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -454,6 +454,11 @@
</listitem>
<listitem>
+ <para>Alexey Shuvaev
+ <email>shuvaev at physik.uni-wuerzburg.de</email></para>
+ </listitem>
+
+ <listitem>
<para>Alexey Zaytsev
<email>mangoost at inetcomm.ru</email></para>
</listitem>
@@ -998,6 +1003,11 @@
</listitem>
<listitem>
+ <para>Arnaud Berthomier
+ <email>oz at cyprio.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Arnaud Launay
<email>asl at launay.org</email></para>
</listitem>
@@ -1502,6 +1512,11 @@
</listitem>
<listitem>
+ <para>ChenGuang LI
+ <email>horus.li at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Chess Griffin
<email>chess at chessgriffin.com</email></para>
</listitem>
@@ -2860,6 +2875,11 @@
</listitem>
<listitem>
+ <para>Eygene Ryabinkin
+ <email>rea-fbsd at codelabs.ru</email></para>
+ </listitem>
+
+ <listitem>
<para>FUJIMOTO Kensaku
<email>fujimoto at oscar.elec.waseda.ac.jp</email></para>
</listitem>
@@ -3538,6 +3558,11 @@
</listitem>
<listitem>
+ <para>Henrik Friedrichsen
+ <email>hrkfrd at googlemail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Henrik Motakef
<email>henrik.motakef at web.de</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.240 2008/08/16 22:21:38 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.242 2008/09/04 15:30:33 chinsan Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -107,6 +107,10 @@
</listitem>
<listitem>
+ <para>&a.bvs;</para>
+ </listitem>
+
+ <listitem>
<para>&a.novel;</para>
</listitem>
@@ -127,6 +131,10 @@
</listitem>
<listitem>
+ <para>&a.makc;</para>
+ </listitem>
+
+ <listitem>
<para>&a.antoine;</para>
</listitem>
@@ -271,10 +279,6 @@
</listitem>
<listitem>
- <para>&a.bvs;</para>
- </listitem>
-
- <listitem>
<para>&a.jwd;</para>
</listitem>
@@ -403,10 +407,6 @@
</listitem>
<listitem>
- <para>&a.lippe;</para>
- </listitem>
-
- <listitem>
<para>&a.fanf;</para>
</listitem>
@@ -455,6 +455,10 @@
</listitem>
<listitem>
+ <para>&a.pgollucci;</para>
+ </listitem>
+
+ <listitem>
<para>&a.daichi;</para>
</listitem>
@@ -467,15 +471,15 @@
</listitem>
<listitem>
- <para>&a.ehaupt;</para>
+ <para>&a.jmg;</para>
</listitem>
<listitem>
- <para>&a.jmg;</para>
+ <para>&a.dhartmei;</para>
</listitem>
<listitem>
- <para>&a.dhartmei;</para>
+ <para>&a.ehaupt;</para>
</listitem>
<listitem>
@@ -911,6 +915,10 @@
</listitem>
<listitem>
+ <para>&a.lippe;</para>
+ </listitem>
+
+ <listitem>
<para>&a.markm;</para>
</listitem>
@@ -991,10 +999,6 @@
</listitem>
<listitem>
- <para>&a.pgollucci;</para>
- </listitem>
-
- <listitem>
<para>&a.hmp;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#2 (text+ko) ====
@@ -22,7 +22,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v 1.42 2006/02/07 21:32:42 joel Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml,v 1.43 2008/09/01 22:37:57 keramida Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -138,7 +138,9 @@
ppp_profile="<replaceable>your_profile</replaceable>"</programlisting>
<note><para>Take care to change <literal>your_profile</literal> to
- the name of your own dialup profile.</para></note>
+ the name of your own dialup profile. The profile name should match the
+ name of the dialup connection in
+ your <filename>/etc/ppp/ppp.conf</filename> file.</para></note>
</sect1>
<sect1 id="rules">
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#5 (text+ko) ====
@@ -11,7 +11,7 @@
<corpauthor>The &os; Ports Management Team</corpauthor>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.30 2008/07/23 16:03:16 pav Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.31 2008/09/01 20:54:15 jkois Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -482,7 +482,7 @@
<listitem>
<para><literal>build srcupdate <replaceable>arch</replaceable>
<replaceable>branch</replaceable>
- <replaceable>buildid</replaceable</literal>> - Replaces the src
+ <replaceable>buildid</replaceable></literal> - Replaces the src
tree with a new ZFS snapshot. Don't forget to use
<literal>-nosrc</literal> flag to <command>dopackages</command>
later!
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#2 (text+ko) ====
@@ -3,7 +3,7 @@
Copyright (c) 2002 Sergey Lyubka <devnull at uptsoft.com>
All rights reserved
-$FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml,v 1.26 2006/06/20 19:34:37 maxim Exp $
+$FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml,v 1.27 2008/09/03 15:45:54 manolis Exp $
-->
<chapter id="boot">
@@ -478,9 +478,10 @@
<sect1 id="boot-kernel">
<title>Kernel initialization</title>
- <para>To where exactly is the execution passed by the loader,
- i.e. what is the kernel's actual entry point. Let us take a
- look at the command that links the kernel:</para>
+ <para>Let us take a look at the command that links the kernel. This
+ will help us identify the exact location where the loader passes
+ execution to the kernel. This location is the kernel's actual entry
+ point.</para>
<programlisting><filename>sys/conf/Makefile.i386:</filename>
ld -elf -Bdynamic -T /usr/src/sys/conf/ldscript.i386 -export-dynamic \
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#3 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v 1.34 2008/08/16 21:42:36 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v 1.35 2008/08/31 13:04:12 keramida Exp $
-->
<chapter id="policies">
@@ -12,6 +12,10 @@
<surname>Kamp</surname>
<contrib>Contributed by </contrib>
</author>
+ <author>
+ <firstname>Giorgos</firstname>
+ <surname>Keramidas</surname>
+ </author>
</authorgroup>
<!-- June 1996 -->
</chapterinfo>
@@ -25,33 +29,55 @@
<title><makevar>MAINTAINER</makevar> on Makefiles</title>
<indexterm><primary>ports maintainer</primary></indexterm>
- <para>If a particular portion of the FreeBSD distribution is being
- maintained by a person or group of persons, they can communicate this
- fact to the world by adding a
+ <para>If a particular portion of the &os; <filename>src/</filename>
+ distribution is being maintained by a person or group of persons,
+ this is communicated through an entry in the
+ <filename>src/MAINTAINERS</filename> file. Maintainers of ports
+ within the Ports Collection express their maintainership to the
+ world by adding a <makevar>MAINTAINER</makevar> line to the
+ <filename>Makefile</filename> of the port in question:</para>
+
+ <programlisting><makevar>MAINTAINER</makevar>= <replaceable>email-addresses</replaceable></programlisting>
- <programlisting>MAINTAINER= email-addresses</programlisting>
+ <tip>
+ <para>For other parts of the repository, or for sections not listed
+ as having a maintainer, or when you are unsure who the active
+ maintainer is, try looking at the recent commit history of the
+ relevant parts of the source tree. It is quite often the case
+ that a maintainer is not explicitly named, but the people who are
+ actively working in a part of the source tree for, say, the last
+ couple of years are interested in reviewing changes. Even if this
+ is not specifically mentioned in the documentation or the source
+ itself, asking for a review as a form of courtesy is a very
+ reasonable thing to do.</para>
+ </tip>
- line to the <filename>Makefile</filename>s covering this portion of the
- source tree.</para>
+ <para>The role of the maintainer is as follows:</para>
- <para>The semantics of this are as follows:</para>
-
+ <itemizedlist>
+ <listitem>
<para>The maintainer owns and is responsible for that code. This means
- that he is responsible for fixing bugs and answering problem reports
+ that he or she is responsible for fixing bugs and answering problem reports
pertaining to that piece of the code, and in the case of contributed
software, for tracking new versions, as appropriate.</para>
+ </listitem>
+ <listitem>
<para>Changes to directories which have a maintainer defined shall be sent
to the maintainer for review before being committed. Only if the
maintainer does not respond for an unacceptable period of time, to
several emails, will it be acceptable to commit changes without review
by the maintainer. However, it is suggested that you try to have the
changes reviewed by someone else if at all possible.</para>
+ </listitem>
+ <listitem>
<para>It is of course not acceptable to add a person or group as
maintainer unless they agree to assume this duty. On the other hand it
does not have to be a committer and it can easily be a group of
people.</para>
+ </listitem>
+ </itemizedlist>
</sect1>
<sect1 id="policies-contributed">
@@ -66,6 +92,10 @@
<firstname>David</firstname>
<surname>O'Brien</surname>
</author>
+ <author>
+ <firstname>Gavin</firstname>
+ <surname>Atkinson</surname>
+ </author>
</authorgroup>
<!-- June 1996 -->
</sect1info>
@@ -90,7 +120,7 @@
model over time, as it has significant advantages over the old method,
including the ability to easily obtain diffs relative to the
<quote>official</quote> versions of the source by everyone (even without
- cvs access). This will make it significantly easier to return changes
+ direct repository access). This will make it significantly easier to return changes
to the primary developers of the contributed software.</para>
<para>Ultimately, however, it comes down to the people actually doing the
@@ -102,50 +132,47 @@
<note>
<para>Because of some unfortunate design limitations with the RCS file
- format and CVS's use of vendor branches, minor, trivial and/or
+ format and the use of vendor branches, minor, trivial and/or
cosmetic changes are <emphasis>strongly discouraged</emphasis> on
files that are still tracking the vendor branch. <quote>Spelling
fixes</quote> are explicitly included here under the
- <quote>cosmetic</quote> category and are to be avoided for files with
- revision 1.1.x.x. The repository bloat impact from a single character
+ <quote>cosmetic</quote> category and are to be avoided.
+ The repository bloat impact from a single character
change can be rather dramatic.</para>
</note>
- <para>The <application>Tcl</application> embedded programming
- language will be used as example of how this model works:</para>
+ <sect2 id="vendor-import-cvs">
+ <title>Vendor Imports with CVS</title>
+
+ <para>The <application>file</application> utility, used to identify
+ the format of a file, will be used as example of how this model
+ works:</para>
- <para><filename>src/contrib/tcl</filename> contains the source as
+ <para><filename>src/contrib/file</filename> contains the source as
distributed by the maintainers of this package. Parts that are entirely
- not applicable for FreeBSD can be removed. In the case of Tcl, the
- <filename>mac</filename>, <filename>win</filename> and
- <filename>compat</filename> subdirectories were eliminated before the
- import.</para>
+ not applicable for &os; can be removed. In the case of &man.file.1;, the
+ <filename>python</filename> subdirectory and files with the <filename>lt</filename>
+ prefix were eliminated before the import, amongst others.</para>
- <para><filename>src/lib/libtcl</filename> contains only a <application>bmake</application> style
+ <para><filename>src/lib/libmagic</filename> contains a <application>bmake</application> style
<filename>Makefile</filename> that uses the standard
<filename>bsd.lib.mk</filename> makefile rules to produce the library
and install the documentation.</para>
- <para><filename>src/usr.bin/tclsh</filename> contains only a bmake style
+ <para><filename>src/usr.bin/file</filename> contains a <application>bmake</application> style
<filename>Makefile</filename> which will produce and install the
- <command>tclsh</command> program and its associated man-pages using the
+ <command>file</command> program and its associated man-pages using the
standard <filename>bsd.prog.mk</filename> rules.</para>
- <para><filename>src/tools/tools/tcl_bmake</filename> contains a couple of
- shell-scripts that can be of help when the tcl software needs updating.
- These are not part of the built or installed software.</para>
-
<para>The important thing here is that the
- <filename>src/contrib/tcl</filename> directory is created according to
+ <filename>src/contrib/file</filename> directory is created according to
the rules: it is supposed to contain the sources as distributed (on a
- proper CVS vendor-branch and without RCS keyword expansion) with as few
+ proper vendor-branch and without RCS keyword expansion) with as few
FreeBSD-specific changes as possible. If there are any doubts on
how to go about it, it is imperative that you ask first and not blunder
- ahead and hope it <quote>works out</quote>. CVS is not forgiving of
- import accidents and a fair amount of effort is required to back out
- major mistakes.</para>
+ ahead and hope it <quote>works out</quote>.</para>
- <para>Because of the previously mentioned design limitations with CVS's
+ <para>Because of the previously mentioned design limitations with
vendor branches, it is required that <quote>official</quote> patches from
the vendor be applied to the original distributed sources and the result
re-imported onto the vendor branch again. Official patches should never
@@ -168,7 +195,7 @@
<filename>src/tools</filename> directory along with the port itself so
that it is available to future maintainers.</para>
- <para>In the <filename>src/contrib/tcl</filename> level directory, a file
+ <para>In the <filename>src/contrib/file</filename> level directory, a file
called <filename>FREEBSD-upgrade</filename> should be added and it
should state things like:</para>
@@ -192,49 +219,298 @@
</listitem>
</itemizedlist>
- <para>However, please do not import <filename>FREEBSD-upgrade</filename>
- with the contributed source. Rather you should <command>cvs add
- FREEBSD-upgrade ; cvs ci</command> after the initial import. Example
- wording from <filename>src/contrib/cpio</filename> is below:</para>
+ <para>Example wording from
+ <filename>src/contrib/groff/FREEBSD-upgrade</filename> is
+ below:</para>
+
+ <programlisting>$FreeBSD: src/contrib/groff/FREEBSD-upgrade,v 1.5.12.1 2005/11/15 22:06:18 ru Exp $
- <programlisting>This directory contains virgin sources of the original distribution files
+This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
-the files in this directory via patches and a cvs commit. New versions or
-official-patch versions must be imported. Please remember to import with
-"-ko" to prevent CVS from corrupting any vendor RCS Ids.
+the files in this directory via patches and a cvs commit.
+
+To upgrade to a newer version of groff, when it is available:
+ 1. Unpack the new version into an empty directory.
+ [Do not make ANY changes to the files.]
+
+ 2. Use the command:
+ cvs import -m 'Virgin import of FSF groff v<version>' \
+ src/contrib/groff FSF v<version>
+
+ For example, to do the import of version 1.19.2, I typed:
+ cvs import -m 'Virgin import of FSF groff v1.19.2' \
+ src/contrib/groff FSF v1_19_2
+
+ 3. Follow the instructions printed out in step 2 to resolve any
+ conflicts between local FreeBSD changes and the newer version.
+
+Do not, under any circumstances, deviate from this procedure.
+
+To make local changes to groff, simply patch and commit to the main
+branch (aka HEAD). Never make local changes on the FSF branch.
+
+All local changes should be submitted to Werner Lemberg <wl at gnu.org> or
+Ted Harding <ted.harding at nessie.mcc.ac.uk> for inclusion in the next
+vendor release.
+
+ru at FreeBSD.org - 20 October 2005</programlisting>
+
+ <para>Another approach my also be taken for the list of files to be
+ excluded, which is especially useful when the list is large or
+ complicated or where imports happen frequently. By creating a
+ file <filename>FREEBSD-Xlist</filename> in the same directory the
+ vendor source is imported into, containing a list of filename
+ patterns to be excluded one per line, future imports can often
+ performed with:</para>
+
+ <screen>&prompt.user; <userinput><command>tar</command> <option>-X</option> <filename>FREEBSD-Xlist</filename> <option>-xzf</option> <filename><replaceable>vendor-source.tgz</replaceable></filename></userinput></screen>
+
+ <para>An example of a <filename>FREEBSD-Xlist</filename> file, from
+ <filename>src/contrib/tcsh</filename>, is here:</para>
+
+ <programlisting>*/BUGS
+*/config/a*
+*/config/bs2000
+*/config/bsd
+*/config/bsdreno
+*/config/[c-z]*
+*/tests
+*/win32</programlisting>
+
+ <note>
+ <para>Please do not import <filename>FREEBSD-upgrade</filename> or
+ <filename>FREEBSD-Xlist</filename> with the contributed source.
+ Rather you should add these files after the initial
+ import.</para>
+ </note>
+
+ </sect2>
+
+ <sect2 id="vendor-import-svn">
+ <sect2info>
+ <authorgroup>
+ <author>
+ <firstname>Dag-Erling</firstname>
+ <surname>Smørgrav</surname>
+ <contrib>Contributed by </contrib>
+ </author>
+ </authorgroup>
+ </sect2info>
+ <title>Vendor Imports with SVN</title>
+
+ <para>This section describes the vendor import procedure with
+ <application>Subversion</application> in details.</para>
+
+ <procedure>
+ <step>
+ <title>Preparing the Tree</title>
+
+ <para>If this is your first import after the switch to
+ <acronym>SVN</acronym>, you will have to flatten and clean
+ up the vendor tree, and bootstrap merge history in the main
+ tree. If not, you can safely omit this step.</para>
+
+ <para>During the conversion from <acronym>CVS</acronym> to
+ <acronym>SVN</acronym>, vendor branches were imported with
+ the same layout as the main tree. For example, the
+ <application>foo</application> vendor sources ended up in
+ <filename>vendor/<replaceable>foo</replaceable>/dist/contrib/<replaceable>foo</replaceable></filename>,
+ but it is pointless and rather inconvenient. What we really
+ want is to have the vendor source directly in
+ <filename>vendor/<replaceable>foo</replaceable>/dist</filename>,
+ like this:</para>
+
+ <screen>&prompt.user; <userinput><command>cd</command> <filename class="directory">vendor/<replaceable>foo</replaceable>/dist/contrib/<replaceable>foo</replaceable></filename></userinput>
+&prompt.user; <userinput><command>svn move</command> $(svn list) <filename>../..</filename></userinput>
+&prompt.user; <userinput><command>cd</command> <filename>../..</filename></userinput>
+&prompt.user; <userinput><command>svn remove</command> <filename>contrib</filename></userinput>
+&prompt.user; <userinput><command>svn propdel</command> <option>-R</option> svn:mergeinfo</userinput>
+&prompt.user; <userinput><command>svn commit</command></userinput></screen>
+
+ <para>Note that, the <literal>propdel</literal> bit is
+ necessary because starting with 1.5, Subversion will
+ automatically add <literal>svn:mergeinfo</literal> to any
+ directory you copy or move. In this case, you will not need
+ this information, since you are not going to merge anything
+ from the tree you deleted.</para>
+
+ <note>
+ <para>You may want to flatten the tags as well. The
+ procedure is exactly the same. If you do this, put off
+ the commit until the end.</para>
+ </note>
+
+ <para>Check the <filename>dist</filename> tree and perform any
+ cleanup that is deemed to be necessary. You may want to
+ disable keyword expansion, as it makes no sense on
+ unmodified vendor code. In some cases, it can be even be
+ harmful.</para>
+
+ <screen>&prompt.user; <userinput><command>svn propdel</command> svn:keywords <option>-R</option> <filename>.</filename></userinput>
+&prompt.user; <userinput><command>svn commit</command></userinput></screen>
+
+ <para>Bootstrapping of <literal>svn:mergeinfo</literal> on the
+ target directory (in the main tree) to the revision that
+ corresponds to the last change was made to the vendor tree
+ prior to importing new sources is also needed:</para>
+
+ <screen>&prompt.user; <userinput><command>cd</command> <filename>head/contrib/<replaceable>foo</replaceable></filename></userinput>
+&prompt.user; <userinput><command>svn merge</command> <option>--record-only</option> <replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist@<replaceable>12345678</replaceable> <filename>.</filename></userinput>
+&prompt.user; <userinput><command>svn commit</command></userinput></screen>
+
+ <para>where <replaceable>svn_base</replaceable> is the base
+ directory of your <acronym>SVN</acronym> repository, e.g.
+ <literal>svn+ssh://svn.FreeBSD.org/base</literal>.</para>
+ </step>
+
+ <step>
+ <title>Importing New Sources</title>
+
+ <para>Prepare a full, clean tree of the vendor sources. With
+ <acronym>SVN</acronym>, we can keep a full distribution in
+ the vendor tree without bloating the main tree. Import
+ everything but merge only what is needed.</para>
+
+ <para>Note that you will need to add any files that were added
+ since the last vendor import, and remove any that were
+ removed. To facilitate this, you should prepare sorted
+ lists of the contents of the vendor tree and of the sources
+ you are about to import:</para>
+
+ <screen>&prompt.user; <userinput><command>cd</command> <filename>vendor/<replaceable>foo</replaceable>/dist</filename></userinput>
+&prompt.user; <userinput><command>svn list</command> <option>-R</option> | <command>grep</command> <option>-v</option> '/$' | <command>sort</command> > <filename>../<replaceable>old</replaceable></filename></userinput>
+&prompt.user; <userinput><command>cd</command> <filename>../<replaceable>foo-9.9</replaceable></filename></userinput>
+&prompt.user; <userinput><command>find</command> <filename>.</filename> <option>-type</option> f | <command>cut</command> <option>-c</option> 3- | <command>sort</command> > <filename>../<replaceable>new</replaceable></filename></userinput></screen>
+
+ <para>With these two files, the following command will list
+ list removed files (files only in
+ <filename><replaceable>old</replaceable></filename>):</para>
+
+ <screen>&prompt.user; <userinput><command>comm <option>-23</option> <filename>../<replaceable>old</replaceable></filename> <filename>../<replaceable>new</replaceable></filename></command></userinput></screen>
+
+ <para>While the command below will list added files (files
+ only in
+ <filename><replaceable>new</replaceable></filename>):</para>
+
+ <screen>&prompt.user; <userinput><command>comm <option>-13</option> <filename>../<replaceable>old</replaceable></filename> <filename>../<replaceable>new</replaceable></filename></command></userinput></screen>
+
+ <para>Let's put this together:</para>
+
+ <screen>&prompt.user; <userinput><command>cd</command> <filename class="directory">vendor/<replaceable>foo</replaceable>/<replaceable>foo-9.9</replaceable></filename></userinput>
+&prompt.user; <userinput><command>tar</command> cf - <filename>.</filename> | <command>tar</command> xf - <option>-C</option> <filename>../dist</filename></userinput>
+&prompt.user; <userinput><command>cd</command> <filename class="directory">../dist</filename></userinput>
+&prompt.user; <userinput><command>comm</command> <option>-23</option> <filename>../<replaceable>old</replaceable></filename> <filename>../<replaceable>new</replaceable></filename> | <command>xargs</command> svn remove</userinput>
+&prompt.user; <userinput><command>comm</command> <option>-13</option> <filename>../<replaceable>old</replaceable></filename> <filename>../<replaceable>new</replaceable></filename> | <command>xargs</command> svn add</userinput></screen>
+
+ <warning>
+ <para>If there are new directories in the new distribution,
+ the last command will fail. You will have to add the
+ directories, and run it again. Conversely, if any
+ directories were removed, you will have to remove them
+ manually.</para>
+ </warning>
+
+ <para>Check properties on any new files:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>All text files
+ should have <literal>svn:eol-style</literal> set to
+ <literal>native</literal>.
+ </listitem>
+
+ <listitem>
+ <para>All binary files should have
+ <literal>svn:mime-type</literal> set to
+ <literal>application/octet-stream</literal>, unless
+ there is a more appropriate media type.</para>
+ </listitem>
+
+ <listitem>
+ <para>Executable files should have
+ <literal>svn:executable</literal> set to
+ <literal>*</literal>.</para>
+ </listitem>
+
+ <listitem>
+ <para>There should be no other properties on any file in
+ the tree.</para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>You are ready to commit, but you should first check
+ the output of <command>svn stat</command> and <command>svn
+ diff</command> to make sure everything is in order.</para>
+ </note>
+
+ <para>Once you have committed the new vendor release, you
+ should tag it for future reference. The best and quickest
+ way is to do it directly in the repository:</para>
+
+ <screen>&prompt.user; <userinput><command>svn copy</command> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/<replaceable>9.9</replaceable></filename></userinput></screen>
+
+ <para>To get the new tag, you can update your working copy of
+ <filename>vendor/<replaceable>foo</replaceable></filename>.</para>
-For the import of GNU cpio 2.4.2, the following files were removed:
+ <note>
+ <para>If you choose to do the copy in the checkout instead,
+ do not forget to remove the generated
+ <literal>svn:mergeinfo</literal> as described
+ above.</para>
+ </note>
+ </step>
- INSTALL cpio.info mkdir.c
- Makefile.in cpio.texi mkinstalldirs
+ <step>
+ <title>Merging to <emphasis>-HEAD</emphasis></title>
-To upgrade to a newer version of cpio, when it is available:
- 1. Unpack the new version into an empty directory.
- [Do not make ANY changes to the files.]
+ <para>After you have prepared your import, it is time to
+ merge. Option <option>--accept=postpone</option> tells
+ <acronym>SVN</acronym> not to handle merge conflicts yet,
+ because they will be taken care of manually:</para>
- 2. Remove the files listed above and any others that don't apply to
- FreeBSD.
+ <screen>&prompt.user; <userinput><command>cd</command> <filename class="directory">head/contrib/<replaceable>foo</replaceable></filename></userinput>
+&prompt.user; <userinput><command>svn update</command></userinput>
+&prompt.user; <userinput><command>svn merge</command> <option>--accept=postpone</option> <filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename></userinput></screen>
- 3. Use the command:
- cvs import -ko -m 'Virgin import of GNU cpio v<version>' \
- src/contrib/cpio GNU cpio_<version>
+ <para>Resolve any conflicts, and make sure that any files that
+ were added or removed in the vendor tree have been properly
+ added or removed in the main tree. It is always a good idea
+ to check differences against the vendor branch:</para>
- For example, to do the import of version 2.4.2, I typed:
- cvs import -ko -m 'Virgin import of GNU v2.4.2' \
- src/contrib/cpio GNU cpio_2_4_2
+ <screen>&prompt.user; <userinput><command>svn diff</command> <option>--no-diff-deleted</option> <option>--old=</option><filename><replaceable>svn_base</replaceable>/vendor/<replaceable>foo</replaceable>/dist</filename> <option>--new=</option><filename>.</filename></userinput></screen>
- 4. Follow the instructions printed out in step 3 to resolve any
- conflicts between local FreeBSD changes and the newer version.
+ <para>The <option>--no-diff-deleted</option> option tells
+ <acronym>SVN</acronym> not to check files that are in the
+ vendor tree but not in the main tree.</para>
-Do not, under any circumstances, deviate from this procedure.
+ <note>
+ <para>With <acronym>SVN</acronym>, there is no concept of on
+ or off the vendor branch. If a file that previously had
+ local modifications no longer does, just remove any
+ left-over cruft, such as &os; version tags, so it no
+ longer shows up in diffs against the vendor tree.</para>
+ </note>
-To make local changes to cpio, simply patch and commit to the main
-branch (aka HEAD). Never make local changes on the GNU branch.
+ <para>If any changes are required for the world to build with
+ the new sources, make them now — and test until you
+ are satisfied that everything build and runs
+ correctly.</para>
+ </step>
-All local changes should be submitted to "cpio at gnu.ai.mit.edu" for
-inclusion in the next vendor release.
+ <step>
+ <title>Commit</title>
-obrien at FreeBSD.org - 30 March 1997</programlisting>
+ <para>Now, you are ready to commit. Make sure you get
+ everything in one go. Ideally, you would have done all
+ steps in a clean tree, in which case you can just commit
+ from the top of that tree. That is the best way to avoid
+ surprises. If you do it properly, the tree will move
+ atomically from a consistent state with the old code to a
+ consistent state with the new code.</para>
+ </step>
+ </procedure>
+ </sect2>
</sect1>
<sect1 id="policies-encumbered">
@@ -411,7 +687,7 @@
<para>For non-port libraries, it is also our policy to change the shared
library version number only once between releases. In addition, it is
our policy to change the major shared library version number only once
- between major OS releases (i.e. from 3.0 to 4.0). When you make a
+ between major OS releases (i.e. from 6.0 to 7.0). When you make a
change to a system library that requires the version number to be
bumped, check the <filename>Makefile</filename>'s commit logs. It is the
responsibility of the committer to ensure that the first such change
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#8 (text+ko) ====
@@ -12,7 +12,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1098 2008/08/16 21:22:24 pgj Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1099 2008/08/21 20:53:08 danger Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -1024,7 +1024,7 @@
a chat channel, first and foremost, and topics there are
just as likely to involve sex, sports or nuclear weapons
as they are &os;. You Have Been Warned! Available at
- server <hostid>irc.chat.org</hostid>.</para>
+ server <hostid>irc.efnet.org</hostid>.</para>
</listitem>
<listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.410 2008/08/06 22:03:49 pgj Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.412 2008/08/24 14:05:24 blackend Exp $
-->
<chapter id="advanced-networking">
@@ -832,9 +832,18 @@
<para>With a device driver configured you need to also bring
in the 802.11 networking support required by the driver.
- For the &man.ath.4; driver this is at least the &man.wlan.4;
- module; this module is automatically loaded with the
- wireless device driver. With that you will need the modules
+ For the &man.ath.4; driver these are at least the &man.wlan.4;,
+ <literal>wlan_scan_ap</literal> and
+ <literal>wlan_scan_sta</literal>
+ modules; the &man.wlan.4; module is automatically loaded with the
+ wireless device driver, the remaining modules must be loaded
+ at boot time via the <filename>/boot/loader.conf</filename>
+ file:</para>
+
+ <programlisting>wlan_scan_ap_load="YES"
+wlan_scan_sta_load="YES"</programlisting>
+
+ <para>With that you will need the modules
that implement cryptographic support for the security
protocols you intend to use. These are intended to be
dynamically loaded on demand by the &man.wlan.4; module but
@@ -868,6 +877,8 @@
device ath_hal # Atheros Hardware Access Layer
device ath_rate_sample # John Bicket's SampleRate control algorithm.
device wlan # 802.11 support (Required)
+device wlan_scan_ap # 802.11 AP mode scanning
+device wlan_scan_sta # 802.11 STA mode scanning
device wlan_wep # WEP crypto support for 802.11 devices
device wlan_ccmp # AES-CCMP crypto support for 802.11 devices
device wlan_tkip # TKIP and Michael crypto support for 802.11 devices</programlisting>
@@ -1654,7 +1665,10 @@
<para>The <literal>weptxkey</literal> means which WEP
key will be used in the transmission. Here we used the
third key. This must match the setting in the access
- point.</para>
+ point. If you do not have any idea of what is the key
+ used by the access point, you should try to use
+ <literal>1</literal> (i.e., the first key) for this
+ value.</para>
</listitem>
<listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#2 (text+ko) ====
@@ -1,14 +1,14 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.123 2008/01/22 13:35:46 gabor Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml,v 1.126 2008/09/03 15:28:34 manolis Exp $
-->
<chapter id="introduction">
<chapterinfo>
<authorgroup>
<author>
- <firstname>Jim</firstname>
+ <firstname>Jim</firstname>
<surname>Mock</surname>
<contrib>Restructured, reorganized, and parts
rewritten by </contrib>
@@ -21,55 +21,58 @@
<sect1 id="introduction-synopsis">
<title>Synopsis</title>
- <para>Thank you for your interest in FreeBSD! The following chapter
- covers various aspects of the FreeBSD Project, such as its history,
+ <para>Thank you for your interest in &os;! The following chapter
+ covers various aspects of the &os; Project, such as its history,
goals, development model, and so on.</para>
<para>After reading this chapter, you will know:</para>
<itemizedlist>
<listitem>
- <para>How FreeBSD relates to other computer operating systems.</para>
+ <para>How &os; relates to other computer operating systems.</para>
</listitem>
+
<listitem>
- <para>The history of the FreeBSD Project.</para>
+ <para>The history of the &os; Project.</para>
</listitem>
+
<listitem>
- <para>The goals of the FreeBSD Project.</para>
+ <para>The goals of the &os; Project.</para>
</listitem>
+
<listitem>
- <para>The basics of the FreeBSD open-source development model.</para>
+ <para>The basics of the &os; open-source development model.</para>
</listitem>
+
<listitem>
- <para>And of course: where the name <quote>FreeBSD</quote> comes from.</para>
+ <para>And of course: where the name <quote>&os;</quote> comes
+ from.</para>
</listitem>
</itemizedlist>
-
</sect1>
<sect1 id="nutshell">
- <title>Welcome to FreeBSD!</title>
- <indexterm><primary>4.4BSD-Lite</primary></indexterm>
+ <title>Welcome to &os;!</title>
+ <indexterm><primary>4.4BSD-Lite</primary></indexterm>
- <para>FreeBSD is a 4.4BSD-Lite based operating system for
+ <para>&os; is a 4.4BSD-Lite based operating system for
Intel (x86 and &itanium;), AMD64, <trademark>Alpha</trademark>, Sun
&ultrasparc; computers. Ports to other
- architectures are also underway.
- You can also
- read about <link linkend="history">the history of FreeBSD</link>,
+ architectures are also underway. You can also
+ read about <link linkend="history">the history of &os;</link>,
or the <link linkend="relnotes">current release</link>. If you
are interested in contributing something to the Project (code,
hardware, funding), see the <ulink
- url="&url.articles.contributing;/index.html">Contributing to FreeBSD</ulink> article.</para>
+ url="&url.articles.contributing;/index.html">Contributing to &os;</ulink> article.</para>
<sect2 id="os-overview">
- <title>What Can FreeBSD Do?</title>
+ <title>What Can &os; Do?</title>
- <para>FreeBSD has many noteworthy features. Some of these
- are:</para>
+ <para>&os; has many noteworthy features. Some of these
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list