PERFORCE change 144274 for review
Remko Lodder
remko at FreeBSD.org
Sun Jun 29 13:48:25 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144274
Change 144274 by remko at remko_nakur on 2008/06/29 13:48:15
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/ldap-auth/Makefile#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/ldap-auth/article.sgml#1 branch
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/mailing-lists.ent#2 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#6 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/audit/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/chapters.ent#5 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/ru_RU.KOI8-R/books/handbook/users/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/ru_RU.KOI8-R/books/handbook/x11/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/ed.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/manolis.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#2 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/stas.key#2 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#2 integrate
.. //depot/projects/docproj_nl/zh_CN.GB2312/articles/Makefile#2 integrate
.. //depot/projects/docproj_nl/zh_CN.GB2312/articles/linux-users/Makefile#1 branch
.. //depot/projects/docproj_nl/zh_CN.GB2312/articles/linux-users/article.sgml#1 branch
.. //depot/projects/docproj_nl/zh_CN.GB2312/articles/remote-install/Makefile#1 branch
.. //depot/projects/docproj_nl/zh_CN.GB2312/articles/remote-install/article.sgml#1 branch
.. //depot/projects/docproj_nl/zh_TW.Big5/articles/Makefile#2 integrate
.. //depot/projects/docproj_nl/zh_TW.Big5/articles/remote-install/Makefile#1 branch
.. //depot/projects/docproj_nl/zh_TW.Big5/articles/remote-install/article.sgml#1 branch
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.58 2008/04/28 15:44:35 gabor Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/Makefile,v 1.60 2008/05/31 13:32:19 remko Exp $
SUBDIR =
SUBDIR+= 5-roadmap
@@ -12,6 +12,7 @@
SUBDIR+= contributing
SUBDIR+= contributing-ports
SUBDIR+= contributors
+SUBDIR+= cups
SUBDIR+= cvs-freebsd
SUBDIR+= cvsup-advanced
SUBDIR+= dialup-firewall
@@ -29,6 +30,7 @@
SUBDIR+= hubs
SUBDIR+= ipsec-must
SUBDIR+= laptop
+SUBDIR+= ldap-auth
SUBDIR+= linux-comparison
SUBDIR+= linux-emulation
SUBDIR+= linux-users
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 (text+ko) ====
@@ -23,7 +23,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.5 2006/10/16 12:35:23 keramida Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml,v 1.7 2008/05/28 21:36:45 keramida Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -47,7 +47,7 @@
<sect1 id="history">
<title>Very Brief Open Source History</title>
- <para>Long before the term Open Source was used, software was
+ <para>Long before the term <quote>Open Source</quote> was used, software was
developed by loose associations of programmers and freely
exchanged. Starting in the early 1950's, organizations such as
<ulink url="http://www.share.org">SHARE</ulink> and <ulink url="http://www.decus.org">DECUS</ulink> developed much of the
@@ -106,7 +106,7 @@
converted Unix to 32-bits, added virtual memory, and implemented
the version of the TCP/IP stack upon which the Internet was
essentially built. UCB made BSD available for the cost of media,
- under what became known as the BSD license. A customer purchased
+ under what became known as <quote>the BSD license</quote>. A customer purchased
Unix from AT&T and then ordered a BSD tape from UCB.</para>
<para>In the mid-1980s a government anti-trust case against ATT
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.791 2008/05/06 13:00:00 itetcu Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.812 2008/06/19 15:20:07 amdmi3 Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -529,6 +529,11 @@
</listitem>
<listitem>
+ <para>Anatoly Borodin
+ <email>anatoly.borodin at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Anatoly Vorobey
<email>mellon at pobox.com</email></para>
</listitem>
@@ -1495,7 +1500,7 @@
<para>Chess Griffin
<email>chess at chessgriffin.com</email></para>
</listitem>
-
+
<listitem>
<para>Chet Ramey
<email>chet at odin.INS.CWRU.Edu</email></para>
@@ -2342,6 +2347,11 @@
</listitem>
<listitem>
+ <para>Dikshie
+ <email>dikshie at sfc.wide.ad.jp</email></para>
+ </listitem>
+
+ <listitem>
<para>Dierk Sacher
<email>dierk at blaxxtarz.de</email></para>
</listitem>
@@ -2417,11 +2427,6 @@
</listitem>
<listitem>
- <para>Dmitry Marakasov
- <email>amdmi3 at mail.ru</email></para>
- </listitem>
-
- <listitem>
<para>Dmitry Semkin
<email>ds at tic-tac.ru</email></para>
</listitem>
@@ -2570,11 +2575,6 @@
</listitem>
<listitem>
- <para>Ed Schouten
- <email>ed at fxq.nl</email></para>
- </listitem>
-
- <listitem>
<para>Ederson de Moura
<email>ederbs at ederbs.org</email></para>
</listitem>
@@ -3454,6 +3454,11 @@
</listitem>
<listitem>
+ <para>Harald Schmalzbauer
+ <email>h.schmalzbauer at omnisec.de</email></para>
+ </listitem>
+
+ <listitem>
<para>Harald Wille
<email>harald.wille at students.jku.at</email></para>
</listitem>
@@ -3777,6 +3782,11 @@
</listitem>
<listitem>
+ <para>Ilya Bakulin
+ <email>webmaster at kibab.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Ilya Khamushkin
<email>ilya at space.rootshell.ru</email></para>
</listitem>
@@ -3807,11 +3817,6 @@
</listitem>
<listitem>
- <para>Ivan Voras
- <email>ivoras at gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>J Shoemaker
<email>shoemaker at softhome.net</email></para>
</listitem>
@@ -4321,6 +4326,11 @@
</listitem>
<listitem>
+ <para>Jim Stapleton
+ <email>sjss at var-dev.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Jim Wilson
<email>wilson at moria.cygnus.com</email></para>
</listitem>
@@ -5378,6 +5388,11 @@
</listitem>
<listitem>
+ <para>Laurent Levier
+ <email>llevier at argosnet.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Lauri Watts
<email>lauri at kde.org</email></para>
</listitem>
@@ -5493,11 +5508,21 @@
</listitem>
<listitem>
+ <para>Lucio Costa
+ <email>lucio at zetasolucoes.com.br</email></para>
+ </listitem>
+
+ <listitem>
<para>Luiz Eduardo Roncato Cordeiro
<email>cordeiro at nic.br</email></para>
</listitem>
<listitem>
+ <para>Luiz Otavio O Souza
+ <email>loos.br at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Lupe Christoph
<email>lupe at lupe-christoph.de</email></para>
</listitem>
@@ -5557,11 +5582,6 @@
</listitem>
<listitem>
- <para>Manolis Kiagias
- <email>sonicy at otenet.gr</email></para>
- </listitem>
-
- <listitem>
<para>Mantas Kaulakys
<email>stone at tainet.lt</email></para>
</listitem>
@@ -5780,10 +5800,6 @@
</listitem>
<listitem>
- <para>Martin Birgmeier</para>
- </listitem>
-
- <listitem>
<para>Martin Dieringer
<email>martin.dieringer at gmx.de</email></para>
</listitem>
@@ -5844,6 +5860,11 @@
</listitem>
<listitem>
+ <para>Martin Sugioarto
+ <email>martin.sugioarto at udo.edu</email></para>
+ </listitem>
+
+ <listitem>
<para>Martin Tournoij
<email>carpetsmoker at gmail.com</email></para>
</listitem>
@@ -5879,6 +5900,11 @@
</listitem>
<listitem>
+ <para>Masahiro Teramoto
+ <email>markun at onohara.to</email></para>
+ </listitem>
+
+ <listitem>
<para>Masakazu HIGAKI
<email>higamasa at dream.com</email></para>
</listitem>
@@ -6398,6 +6424,11 @@
</listitem>
<listitem>
+ <para>Mike Bowie
+ <email>mbowie at buzmo.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Mike Bristow
<email>mike at urgle.com</email></para>
</listitem>
@@ -6602,6 +6633,11 @@
</listitem>
<listitem>
+ <para>Mykola Marzhan
+ <email>delgod at portaone.com</email></para>
+ </listitem>
+
+ <listitem>
<para>N.G.Smith
<email>ngs at sesame.hensa.ac.uk</email></para>
</listitem>
@@ -7177,6 +7213,11 @@
</listitem>
<listitem>
+ <para>Oleg A. Mamontov
+ <email>oleg at mamontov.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Oleg M. Golovanov
<email>olmi at rentech.ru</email></para>
</listitem>
@@ -8661,6 +8702,11 @@
</listitem>
<listitem>
+ <para>Sofian Brabez
+ <email>sbrabez at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Soren Dayton
<email>csdayton at midway.uchicago.edu</email></para>
</listitem>
@@ -8988,6 +9034,11 @@
</listitem>
<listitem>
+ <para>Sven Klose
+ <email>pixel at hugbox.org</email></para>
+ </listitem>
+
+ <listitem>
<para>Sven Mohr
<email>svmohr at rm6.net</email></para>
</listitem>
@@ -9312,6 +9363,11 @@
</listitem>
<listitem>
+ <para>Timofeev Vladimir
+ <email>vovkasm at gmail.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Timothy Bourke
<email>timbob at bigpond.com</email></para>
</listitem>
@@ -9637,6 +9693,11 @@
</listitem>
<listitem>
+ <para>Vany Serezhkin
+ <email>ivan at serezhkin.com</email></para>
+ </listitem>
+
+ <listitem>
<para>Vaclav Haisman
<email>v.haisman at sh.cvut.cz</email></para>
</listitem>
@@ -9987,6 +10048,11 @@
</listitem>
<listitem>
+ <para>Yi-Jheng Lin
+ <email>yzlin at cs.nctu.edu.tw</email></para>
+ </listitem>
+
+ <listitem>
<para>Ying-Chieh Chen
<email>yinjieh at csie.nctu.edu.tw</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.224 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.232 2008/06/23 11:42:41 erik Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -171,6 +171,10 @@
</listitem>
<listitem>
+ <para>&a.erik;</para>
+ </listitem>
+
+ <listitem>
<para>&a.gahr;</para>
</listitem>
@@ -587,6 +591,10 @@
</listitem>
<listitem>
+ <para>&a.manolis;</para>
+ </listitem>
+
+ <listitem>
<para>&a.kientzle;</para>
</listitem>
@@ -778,6 +786,10 @@
</listitem>
<listitem>
+ <para>&a.eri;</para>
+ </listitem>
+
+ <listitem>
<para>&a.pav;</para>
</listitem>
@@ -806,6 +818,10 @@
</listitem>
<listitem>
+ <para>&a.amdmi3;</para>
+ </listitem>
+
+ <listitem>
<para>&a.kwm;</para>
</listitem>
@@ -1146,6 +1162,10 @@
</listitem>
<listitem>
+ <para>&a.ed;</para>
+ </listitem>
+
+ <listitem>
<para>&a.cy;</para>
</listitem>
@@ -1378,6 +1398,10 @@
</listitem>
<listitem>
+ <para>&a.ivoras;</para>
+ </listitem>
+
+ <listitem>
<para>&a.ticso;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.52 2007/10/14 11:55:29 joel Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.53 2008/06/01 00:14:49 miwi Exp $ -->
<itemizedlist>
<listitem>
@@ -324,7 +324,7 @@
<ulink url="http://freebsd.kde.org/memoriam/alane.php">2003</ulink>)
</para>
</listitem>
-
+
<listitem>
<para>&a.amurai; (1995 - 2003)</para>
</listitem>
@@ -705,8 +705,8 @@
<para>Andrew L. Moore (1993 - 1995)</para>
</listitem>
</itemizedlist>
-
-<!--
+
+<!--
Local Variables:
mode: sgml
sgml-declaration: "chapter.decl"
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-users/article.sgml#2 (text+ko) ====
@@ -19,7 +19,7 @@
<holder>The FreeBSD Documentation Project</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.2 2008/04/14 13:08:18 jkois Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-users/article.sgml,v 1.6 2008/05/26 16:44:05 gabor Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -64,7 +64,7 @@
shells are available in &os;'s <ulink
url="article.html#SOFTWARE">Packages and Ports Collection</ulink>.</para>
- <para>If you do install other shells you can use &man.chsh.1 to set
+ <para>If you do install other shells you can use &man.chsh.1; to set
a user's default shell. It is, however, recommended that the
<username>root</username>'s default shell remain unchanged. The
reason for this is that shells not included in the base distribution
@@ -153,7 +153,7 @@
process. If the Ports Collection has not been installed it can be
added from the installation discs using &man.sysinstall.8;, or pulled
from the &os; servers using &man.csup.1; or &man.portsnap.8;.
- Detailed instructions for installaing the Ports Collection can be
+ Detailed instructions for installing the Ports Collection can be
found in <ulink
url="&url.base;/doc/en_US.ISO8859-1/books/handbook/ports-using.html">section 4.5.1</ulink>
of the handbook.</para>
@@ -218,7 +218,7 @@
customize, ports are the way to go. (And remember, if you
need to customize but prefer packages, you can build a custom
package from ports using <command>make</command>
- <maketarget>patch</maketarget> and then copy the package to
+ <maketarget>package</maketarget> and then copy the package to
other servers.)</para>
</sect2>
</sect1>
@@ -511,14 +511,14 @@
<tbody>
<row>
- <entry><command>yum install <package></command> / <command>apt-get install <package></command></entry>
- <entry><command>pkg_add -r <package></command></entry>
- <entry>Install <package> from remote repository</entry>
+ <entry><command>yum install <replaceable>package</replaceable></command> / <command>apt-get install <replaceable>package</replaceable></command></entry>
+ <entry><command>pkg_add -r <replaceable>package</replaceable></command></entry>
+ <entry>Install <replaceable>package</replaceable> from remote repository</entry>
</row>
<row>
- <entry><command>rpm -ivh <package></command> / <command>dpkg -i <package></command></entry>
- <entry><command>pkg_add -v <package></command></entry>
+ <entry><command>rpm -ivh <replaceable>package</replaceable></command> / <command>dpkg -i <replaceable>package</replaceable></command></entry>
+ <entry><command>pkg_add -v <replaceable>package</replaceable></command></entry>
<entry>Install package</entry>
</row>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#2 (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.26 2008/02/03 21:58:28 ceri Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.28 2008/06/11 12:15:30 pav Exp $</pubdate>
<copyright>
<year>2003</year>
@@ -46,14 +46,14 @@
otherwise specified, all paths will be relative to
this location. <replaceable>${arch}</replaceable> will
be used to specify one of the package architectures
- (amd64, &i386;, ia64, and &sparc64;), and
+ (amd64, &i386;, and &sparc64;), and
<replaceable>${branch}</replaceable> will be used
- to specify the build branch (5, 6, 6-exp, 7, 7-exp, 8, 8-exp).
+ to specify the build branch (6, 6-exp, 7, 7-exp, 8, 8-exp).
</para>
<note>
- <para>Packages are no longer built for Release 4, nor
- for the alpha architecture.</para>
+ <para>Packages are no longer built for Release 4 or 5, nor
+ for the alpha nor ia64 architectures.</para>
</note>
<para>The scripts that control all of this live in
@@ -175,12 +175,6 @@
<itemizedlist>
<listitem>
- <para><command>dopackages.5</command> - Perform a
- 5.X build
- </para>
- </listitem>
-
- <listitem>
<para><command>dopackages.6</command> - Perform
a 6.X build
</para>
@@ -343,12 +337,9 @@
</listitem>
<listitem>
- <para><literal>-distfiles</literal> - Collect distfiles
+ <para><literal>-nodistfiles</literal> - Do not collect distfiles
that pass <command>make checksum</command> for later
- uploading to <hostid>ftp-master</hostid>. Use this
- sparingly because it takes up a lot of disk space.
- You should remove the distfiles once they have been
- transfered to <hostid>ftp-master</hostid>.
+ uploading to <hostid>ftp-master</hostid>.
</para>
</listitem>
@@ -422,9 +413,9 @@
</example>
<example>
- <title>Restart an interrupted amd64-5 build without updating</title>
+ <title>Restart an interrupted amd64-8 build without updating</title>
- <para><command>dopackages.5 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
+ <para><command>dopackages.8 amd64 -nocvs -noportscvs -norestr -continue -noindex -noduds -nofinish</command></para>
</example>
<example>
@@ -749,16 +740,12 @@
use the <literal>-cdrom</literal> option to
<command>dopackages</command>.</para>
- <para>Assuming disk space is available on the cluster, use
- <literal>-distfiles</literal> to collect distfiles.</para>
-
- <note><para>You must run the initial build with
- <literal>-distfiles</literal> to collect
- all the fetched distfiles.</para></note>
+ <para>If the disk space is not available on the cluster, use
+ <literal>-nodistfiles</literal> to avoid collecting distfiles.</para>
<para>After the initial build completes, restart the build
with
- <literal>-restart -distfiles -fetch-original</literal>
+ <literal>-restart -fetch-original</literal>
to collect updated distfiles as well. Then, once the
build is post-processed, take an inventory of the list
of files fetched:</para>
@@ -828,19 +815,19 @@
<itemizedlist>
<listitem>
- <para><literal>packages-6.1-release</literal></para>
+ <para><literal>packages-6.3-release</literal></para>
</listitem>
<listitem>
- <para><literal>packages-6.2-release</literal></para>
+ <para><literal>packages-6-stable</literal></para>
</listitem>
<listitem>
- <para><literal>packages-6-stable</literal></para>
+ <para><literal>packages-7.0-release</literal></para>
</listitem>
<listitem>
- <para><literal>packages-7-current</literal></para>
+ <para><literal>packages-7-stable</literal></para>
</listitem>
<listitem>
@@ -897,8 +884,13 @@
<screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr at ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${subdir}</replaceable>/ | tee log</userinput></screen>
- <para>Distfiles can also be transferred via
- <command>rsync</command>:</para>
+ <para>Distfiles can be transferred with the
+ <command>cpdistfiles</command> script:</para>
+
+ <screen>&prompt.root; <userinput>/var/portbuild/scripts/cpdistfiles <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable></userinput></screen>
+
+ <para>Or you can do it by hand using <command>rsync</command>
+ command:</para>
<screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
&prompt.root; <userinput>rsync -n -r -v -l -p -c distfiles/ portmgr at ftp-master:w/ports/distfiles/ | tee log</userinput></screen>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/problem-reports/article.sgml#2 (text+ko) ====
@@ -7,7 +7,7 @@
<articleinfo>
<title>Writing &os; Problem Reports</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.55 2008/04/23 09:30:01 linimon Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.56 2008/05/28 00:36:07 gabor Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -1207,7 +1207,7 @@
<note>
<para>Among the anti-spam measures is one that weighs against
- many common abuses seen HTML-based email (although not necessarily
+ many common abuses seen in HTML-based email (although not necessarily
the mere inclusion of HTML in a PR). We strongly recommend
against the use of HTML-based email when sending PRs: not
only is it more likely to fall afoul of the filters, it also
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#2 (text+ko) ====
@@ -6,11 +6,11 @@
<book>
<bookinfo>
- <title>Frequently Asked Questions for FreeBSD 5.X and 6.X</title>
+ <title>Frequently Asked Questions for FreeBSD 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable></title>
<corpauthor>The FreeBSD Documentation Project</corpauthor>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.811 2008/04/12 20:13:12 keramida Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1004 2008/06/21 12:24:43 pgj Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -26,6 +26,7 @@
<year>2005</year>
<year>2006</year>
<year>2007</year>
+ <year>2008</year>
<holder>The FreeBSD Documentation Project</holder>
</copyright>
@@ -56,8 +57,8 @@
</legalnotice>
<abstract>
- <para>This is the FAQ for FreeBSD versions 5.X and 6.X.
- All entries are assumed to be relevant to FreeBSD 5.X and
+ <para>This is the FAQ for FreeBSD versions 6.<replaceable>X</replaceable> and 7.<replaceable>X</replaceable>.
+ All entries are assumed to be relevant to FreeBSD 6.<replaceable>X</replaceable> and
later, unless otherwise noted. If you are interested in
helping with this project, send email to the &a.doc;. The
latest version of this document is always available from the
@@ -76,7 +77,7 @@
<chapter id="introduction">
<title>Introduction</title>
- <para>Welcome to the FreeBSD 5.X-6.X FAQ!</para>
+ <para>Welcome to the FreeBSD 6.<replaceable>X</replaceable>-7.<replaceable>X</replaceable> FAQ!</para>
<para>As is usual with Usenet FAQs, this document aims to cover the
most frequently asked questions concerning the FreeBSD operating
@@ -97,8 +98,8 @@
<answer>
<para>Briefly, FreeBSD is a &unix; like operating system for
- the Alpha/AXP, AMD64 and &intel; EM64T, &i386; IA-64,
- PC-98, and &ultrasparc; platforms
+ AMD64 and &intel; EM64T, &i386; PC-98, IA-64, &arm;, &powerpc;
+ and &ultrasparc; platforms
based on U.C. Berkeley's <quote>4.4BSD-Lite</quote>
release, with some <quote>4.4BSD-Lite2</quote>
enhancements. It is also based indirectly on William
@@ -288,28 +289,28 @@
<answer>
<para>At this point in FreeBSD's development, there are two
parallel development branches; releases are being made from
- both branches. The 5.X series of releases
- is being made from the <emphasis>5-STABLE</emphasis> branch
- and the 6.X series of releases from <emphasis>6-STABLE</emphasis>.
+ both branches. The 6.<replaceable>X</replaceable> series of releases
+ is being made from the <emphasis>6-STABLE</emphasis> branch
+ and the 7.<replaceable>X</replaceable> series of releases from <emphasis>7-STABLE</emphasis>.</para>
- <para>Up until the release of 5.3, the 4.X series was the
+ <para>Up until the release of 7.0, the 6.<replaceable>X</replaceable> series was the
one known as <emphasis>-STABLE</emphasis>. However,
- as of 5.3, the 4.X branch will be designated for
+ as of 7.0, the 6.<replaceable>X</replaceable> branch will be designated for
an <quote>extended support</quote> status and receive
only fixes for major problems, such as security-related
fixes. There will be more releases made from the
- <emphasis>5-STABLE</emphasis> branch, but it is considered
+ <emphasis>6-STABLE</emphasis> branch, but it is considered
a <quote>legacy</quote> branch and most current work will
- only become a part of <emphasis>6-STABLE</emphasis>.
+ only become a part of <emphasis>7-STABLE</emphasis>.</para>
<para>Version <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;</ulink>
is the latest release from the
- <emphasis>6-STABLE</emphasis> branch; it was released in
+ <emphasis>7-STABLE</emphasis> branch; it was released in
&rel.current.date;. Version <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel2.current;-RELEASE/">&rel2.current;</ulink>
is the latest release from the
- <emphasis>5-STABLE</emphasis> branch; it was released in
+ <emphasis>6-STABLE</emphasis> branch; it was released in
&rel2.current.date;.</para>
<para>Briefly, <emphasis>-STABLE</emphasis> is aimed at the
@@ -339,7 +340,7 @@
<qandaentry>
<question id="current">
- <para>What is FreeBSD-CURRENT?</para>
+ <para>What is <emphasis>FreeBSD-CURRENT</emphasis>?</para>
</question>
<answer>
@@ -352,8 +353,8 @@
system and die-hard hobbyists. See the <ulink
url="&url.books.handbook;/cutting-edge.html#CURRENT">relevant
section</ulink> in the <ulink
- url="&url.books.handbook;/index.html">handbook</ulink> for details
- on running -CURRENT.</para>
+ url="&url.books.handbook;/index.html">Handbook</ulink> for details
+ on running <emphasis>-CURRENT</emphasis>.</para>
<para>If you are not familiar with the operating system or are
not capable of identifying the difference between a real
@@ -364,14 +365,14 @@
analyze any problems and only report them if they are deemed
to be mistakes rather than <quote>glitches</quote>. Questions
such as <quote>make world produces some error about
- groups</quote> on the -CURRENT mailing list may be
+ groups</quote> on the &a.current; may be
treated with contempt.</para>
- <para>Every day, <ulink
- url="&url.base;/snapshots/">snapshot
- </ulink> releases are made based on the current state of the
- -CURRENT and -STABLE branches. Distributions of the
- occasional snapshot are made available. The goals
+ <para>Every month, <ulink
+ url="&url.base;/snapshots/">snapshot</ulink>
+ releases are made based on the current state of the
+ <emphasis>-CURRENT</emphasis> and <emphasis>-STABLE</emphasis> branches.
+ The goals
behind each snapshot release are:</para>
<itemizedlist>
@@ -381,8 +382,8 @@
</listitem>
<listitem>
- <para>To give people who would like to run -CURRENT or
- -STABLE but who do not have the time or bandwidth to
+ <para>To give people who would like to run <emphasis>-CURRENT</emphasis> or
+ <emphasis>-STABLE</emphasis> but who do not have the time or bandwidth to
follow it on a day-to-day basis an easy way of
bootstrapping it onto their systems.</para>
</listitem>
@@ -391,7 +392,7 @@
<para>To preserve a fixed reference point for the code in
question, just in case we break something really badly
later. (Although CVS normally prevents anything horrible
- like this happening :)</para>
+ like this happening.)</para>
</listitem>
<listitem>
@@ -401,23 +402,26 @@
</listitem>
</itemizedlist>
- <para>No claims are made that any -CURRENT snapshot can be
+ <para>No claims are made that any <emphasis>-CURRENT</emphasis> snapshot can be
considered <quote>production quality</quote> for any purpose.
If you want to run a stable and fully tested system, you will
- have to stick to full releases, or use the -STABLE
+ have to stick to full releases, or use the <emphasis>-STABLE</emphasis>
snapshots.</para>
<para>Snapshot releases are directly available from <ulink
url="&url.base;/snapshots/">snapshot</ulink>.</para>
- <para>Snapshots are generated, on the average, daily for
- all actively developed branches.</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>
</answer>
</qandaentry>
<qandaentry>
<question id="stable">
- <para>What is the FreeBSD-STABLE concept?</para>
+ <para>What is the <emphasis>FreeBSD-STABLE</emphasis> concept?</para>
</question>
<answer>
@@ -426,35 +430,36 @@
url="&url.books.handbook;/current-stable.html#STABLE">-STABLE</ulink>,
one <ulink
url="&url.books.handbook;/current-stable.html#CURRENT">-CURRENT</ulink>.
- FreeBSD-STABLE is intended for Internet Service Providers
+ <emphasis>FreeBSD-STABLE</emphasis> is intended for Internet Service Providers
and other commercial enterprises for whom sudden shifts or
experimental features are quite undesirable. It receives
only well-tested bug fixes and other small incremental
- enhancements. FreeBSD-CURRENT, on the other hand, has
+ enhancements. <emphasis>FreeBSD-CURRENT</emphasis>, on the other hand, has
been one unbroken line since 2.0 was released, leading
- towards 6.2-RELEASE and beyond. Just before 6.0-RELEASE, the
- 6-STABLE branch was created, and
- &os.current; became 7-CURRENT. For more detailed information,
- see <quote><ulink url="&url.articles.releng;/release-proc.html#REL-BRANCH">
- FreeBSD Release Engineering:
- Creating the Release Branch</ulink></quote>.</para>
+ towards &rel.current;-RELEASE and beyond. For more detailed information on branches
+ see <quote><ulink
+ url="&url.articles.releng;/release-proc.html#REL-BRANCH">FreeBSD 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>
<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 3.5.1, the
- final 3.X release. The 4-STABLE branch has ended with the release
- of 4.11, the final 4.X release. The only changes made to either
+ final 3.<replaceable>X</replaceable> release. The 4-STABLE branch has ended with the release
+ of 4.11, the final 4.<replaceable>X</replaceable> release. The only changes made to either
of these branches will be, for the most part, security-related bug
- fixes. Support for the 5-STABLE branches will continue for some
- time but focus primarily on security-related bug fixes and other
- serious issues.</para>
+ fixes. Support for the 5-STABLE branches has ended with the
+ release of 5.5, the final 5.<replaceable>X</replaceable> release.
+ Support for the 6-STABLE branches will continue for some time but
+ focus primarily on security-related bug fixes and other serious
+ issues.</para>
- <para>&rel.current;-STABLE is the actively developed -STABLE branch.
+ <para>&rel.current;-STABLE is the actively developed <emphasis>-STABLE</emphasis> branch.
The latest release on the &rel.current;-STABLE branch is
&rel.current;-RELEASE, which was released in
&rel.current.date;.</para>
- <para>The 7-CURRENT branch is the actively developed
- -CURRENT branch toward the next generation of &os;.
+ <para>The 8-CURRENT branch is the actively developed
+ <emphasis>-CURRENT</emphasis> branch toward the next generation of &os;.
See <link linkend="current">What is &os;-CURRENT?</link> for more
information on this branch.</para>
</answer>
@@ -466,8 +471,9 @@
</question>
<answer>
- <para>The &a.re; releases a new version of FreeBSD about every
- four months, on average. Release dates are announced well in
+ <para>The &a.re; releases a new major version of &os; about every
+ 18 months and a new minor version about every
+ 8 months, on average. Release dates are announced well in
advance, so that the people working on the system know
when their projects need to be finished and tested.
A testing period precedes each release, in order to ensure
@@ -475,7 +481,7 @@
stability of the release.
Many users regard this caution as one of the best things about
FreeBSD, even though waiting for all the latest goodies to reach
- -STABLE can be a little frustrating.</para>
+ <emphasis>-STABLE</emphasis> can be a little frustrating.</para>
<para>More information on the release engineering process
(including a schedule of upcoming releases) can be found
@@ -524,7 +530,7 @@
<itemizedlist>
<listitem>
- <para>The latest 6-STABLE release, &rel.current;-RELEASE can be
+ <para>The latest 7-STABLE release, &rel.current;-RELEASE can be
found in the <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/i386/&rel.current;-RELEASE/">&rel.current;-RELEASE directory</ulink>.</para>
</listitem>
@@ -532,7 +538,7 @@
<listitem>
<para><ulink
url="&url.base;/snapshots/">
- Snapshot</ulink> releases are made daily for the
+ Snapshot</ulink> releases are made monthly for the
<link linkend="current">-CURRENT</link> and <link
linkend="stable">-STABLE</link> branch, these being
of service purely to bleeding-edge testers and
@@ -540,7 +546,7 @@
</listitem>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list