Date: Fri, 31 Dec 2010 21:13:59 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 187360 for review Message-ID: <201012312113.oBVLDxoI039367@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@187360?ac=10 Change 187360 by rene@rene_acer on 2010/12/31 21:13:25 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#82 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#17 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#97 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ache.key#2 integrate .. //depot/projects/docproj_nl/www/en/cgi/cgi-style.pl#6 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#20 integrate .. //depot/projects/docproj_nl/www/en/cgi/ports.cgi#5 integrate .. //depot/projects/docproj_nl/www/en/internal/machines.sgml#7 integrate .. //depot/projects/docproj_nl/www/en/projects/newbies.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/releases/7.4R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releases/8.2R/schedule.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#39 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#9 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#21 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#27 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#36 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#97 integrate .. //depot/projects/docproj_nl/www/share/sgml/release.ent#30 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#82 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.976 2010/12/03 20:52:54 jpaetzel Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.981 2010/12/29 20:44:12 decke Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -369,6 +369,11 @@ </listitem> <listitem> + <para>Alexander Churanov + <email>alexanderchuranov@gmail.com</email></para> + </listitem> + + <listitem> <para>Alexander B. Povolotsky <email>tarkhil@mgt.msk.ru</email></para> </listitem> @@ -913,6 +918,11 @@ </listitem> <listitem> + <para>Anes Muhametov + <email>anes@anes.su</email></para> + </listitem> + + <listitem> <para>Angel Todorov <email>todorov_bg@gmx.net</email></para> </listitem> @@ -6650,6 +6660,11 @@ </listitem> <listitem> + <para>Mickael Maillot + <email>mickael.maillot@gmail.com</email></para> + </listitem> + + <listitem> <para>Miguel Angel Sagreras <email>msagre@cactus.fi.uba.ar</email></para> </listitem> @@ -7554,6 +7569,11 @@ </listitem> <listitem> + <para>Oliver Heesakkers + <email>dev2@heesakkers.info</email></para> + </listitem> + + <listitem> <para>Oliver Helmling <email>oliver.helmling@stud.uni-bayreuth.de</email></para> </listitem> @@ -10428,6 +10448,11 @@ </listitem> <listitem> + <para>Yanhui Shen + <email>shen.elf@gmail.com</email></para> + </listitem> + + <listitem> <para>Yann Berthier <email>yb@bachibouzouk.org</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.251 2010/12/04 17:56:15 bcr Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.252 2010/12/20 19:03:37 bcr Exp $ --> <chapter id="updating-upgrading"> @@ -3037,31 +3037,33 @@ <para>As a part of the &os; development lifecycle, it happens from time to time that files and their contents become obsolete. This may be - because their functionality is implemented elsewhere or is removed from - the system entirely. This includes old files, libraries and - directories, which should be removed when updating the system. The - benefit for the user is that the system is not cluttered with old files - which take up unnecessary space on the storage (and backup) medium. The - files, directories, and libraries that are considered obsolete are listed - in <filename>/usr/src/ObsoleteFiles.inc</filename>. The following + because their functionality is implemented elsewhere, the version number + of the library has changed or it was removed from the system entirely. + This includes old files, libraries and directories, which should + be removed when updating the system. The benefit for the user is that + the system is not cluttered with old files which take up unnecessary + space on the storage (and backup) medium. Additionally, if the old + library had a security or stability issue, you should update to the + newer library to keep your system safe and prevent crashes caused by + the old library implementation. The files, directories, and libraries + that are considered obsolete are listed in + <filename>/usr/src/ObsoleteFiles.inc</filename>. The following instructions will help you removing these obsolete files during the system upgrade process.</para> <para>We assume you are following the steps outlined in <xref linkend="canonical-build">. After the <command>make - <maketarget>installworld</maketarget></command> command completed - successfully, you should check for obsolete files and libraries as - follows:</para> + <maketarget>installworld</maketarget></command> and the subsequent + <command>mergemaster</command> commands have finished successfully, you + should check for obsolete files and libraries as follows:</para> <screen>&prompt.root; <userinput>cd /usr/src</userinput> -&prompt.root; <userinput>make check-old</userinput> -&prompt.root; <userinput>make check-old-libs</userinput></screen> +&prompt.root; <userinput>make check-old</userinput></screen> <para>If any obsolete files are found, they can be deleted using the following commands:</para> - <screen>&prompt.root; <userinput>make delete-old</userinput> -&prompt.root; <userinput>make delete-old-libs</userinput></screen> + <screen>&prompt.root; <userinput>make delete-old</userinput></screen> <tip> <para>See <filename>/usr/src/Makefile</filename> @@ -3070,23 +3072,29 @@ <para>A prompt is displayed before deleting each obsolete file. You can skip the prompt and let the system remove these files automatically by - setting the <makevar>BATCH_DELETE_OLD_FILES</makevar> environment - variable to <literal>yes</literal>. You can also achieve the same goal - by piping these commands through <command>yes</command> like this:</para> + using the <makevar>BATCH_DELETE_OLD_FILES</makevar> make-variable as + follows:<para> + + <screen>&prompt.root; <userinput>make -DBATCH_DELETE_OLD_FILES delete-old</userinput></screen> + + <para>You can also achieve the same goal by piping these commands through + <command>yes</command> like this:</para> - <screen>&prompt.root; <userinput>yes|make delete-old</userinput> -&prompt.root; <userinput>yes|make delete-old-libs</userinput></screen> + <screen>&prompt.root; <userinput>yes|make delete-old</userinput></screen> <warning> <title>Warning</title> <para>Deleting obsolete files will break applications that still - depend on those obsolete files.</para> + depend on those obsolete files. This is especially true for old + libraries. In most cases, you need to recompile the programs, ports, + or libraries that used the old library before <command>make + <maketarget>delete-old-libs</maketarget></command> is executed.</para> </warning> <para>Utilities for checking shared library dependencies are available from - the Ports Collection - in <filename role="package">sysutils/libchk</filename> - or <filename role="package">sysutils/bsdadminscripts</filename>.</para> + the Ports Collection in <filename + role="package">sysutils/libchk</filename> or <filename + role="package">sysutils/bsdadminscripts</filename>.</para> <para>Obsolete shared libraries can conflict with newer libraries, causing messages like these:</para> @@ -3103,8 +3111,13 @@ /usr/local/lib/libXext.so was installed by package libXext-1.1.1,1</screen> <para>Then deinstall, rebuild and reinstall the port. The <filename - role="package">ports-mgmt/portmaster</filename> utility can be used to - automate this process.</para> + role="package">ports-mgmt/portmaster</filename> and <filename + role="package">ports-mgmt/portupgrade</filename> utilities can be used to + automate this process. After you've made sure that all ports are rebuilt + and do not use the old libraries anymore, you can delete them using the + following command:</para> + + <screen>&prompt.root; <userinput>make delete-old-libs</userinput></screen> </sect1> <sect1 id="small-lan"> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#16 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.97 2010/08/24 13:18:01 manolis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.98 2010/12/22 16:53:32 ryusuke Exp $ --> <chapter id="desktop"> @@ -202,7 +202,7 @@ <title>Firefox and &java; Plugin</title> <note> - <para>In this section and in the next one, we assume you have + <para>In this section and in the next two sections, we assume you have already installed <application>Firefox</application>.</para> <para>Currently, the &java; plugin does not work with ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#17 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.300 2010/12/03 09:38:53 rene Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.302 2010/12/30 00:41:40 ryusuke Exp $ --> <chapter id="disks"> @@ -427,7 +427,7 @@ identifying the correct jumper.</para></note> <para>Next, consider how to attach them as part of the file - system. You should research both &man.vinum.8; (<xref + system. You should research both &man.vinum.4; (<xref linkend="vinum-vinum">) and &man.ccd.4;. In this particular configuration, &man.ccd.4; was chosen.</para> </sect4> @@ -585,11 +585,11 @@ from the block device interface and maps data in ways which result in an increase in flexibility, performance and reliability compared to the traditional slice view of disk - storage. &man.vinum.8; implements the RAID-0, RAID-1 and + storage. &man.vinum.4; implements the RAID-0, RAID-1 and RAID-5 models, both individually and in combination.</para> <para>See <xref linkend="vinum-vinum"> for more - information about &man.vinum.8;.</para> + information about &man.vinum.4;.</para> </sect3> </sect2> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#8 (text+ko) ==== @@ -1,5 +1,5 @@ <!-- - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.46 2008/12/23 18:59:03 trhodes Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.48 2010/12/24 18:08:59 ryusuke Exp $ --> <preface id="book-preface"> @@ -8,8 +8,8 @@ <bridgehead id="preface-audience" renderas=sect1>Intended Audience</bridgehead> - <para>The FreeBSD newcomer will find that the first section of this - book guides the user through the FreeBSD installation process and + <para>The &os; newcomer will find that the first section of this + book guides the user through the &os; installation process and gently introduces the concepts and conventions that underpin &unix;. Working through this section requires little more than the desire to explore, and the ability to take on board new concepts as they @@ -17,7 +17,7 @@ <para>Once you have traveled this far, the second, far larger, section of the Handbook is a comprehensive reference to all manner - of topics of interest to FreeBSD system administrators. Some of + of topics of interest to &os; system administrators. Some of these chapters may recommend that you do some prior reading, and this is noted in the synopsis at the beginning of each chapter.</para> @@ -63,7 +63,7 @@ Second Edition (2004)</bridgehead> <para>The third edition was the culmination of over two years of - work by the dedicated members of the FreeBSD Documentation + work by the dedicated members of the &os; Documentation Project. The printed edition grew to such a size that it was necessary to publish as two separate volumes. The following are the major changes in this new edition:</para> @@ -86,7 +86,7 @@ <listitem> <para><xref linkend="mac">, Mandatory Access Control (MAC), is a new chapter with this edition. It explains what MAC is - and how this mechanism can be used to secure a FreeBSD + and how this mechanism can be used to secure a &os; system.</para> </listitem> @@ -129,7 +129,7 @@ <listitem> <para><xref linkend="advanced-networking">, Advanced Networking, has been expanded with new information about - using &bluetooth; devices with FreeBSD, setting up wireless + using &bluetooth; devices with &os;, setting up wireless networks, and Asynchronous Transfer Mode (ATM) networking.</para> </listitem> @@ -150,7 +150,7 @@ First Edition (2001)</bridgehead> <para>The second edition was the culmination of over two years of - work by the dedicated members of the FreeBSD Documentation + work by the dedicated members of the &os; Documentation Project. The following were the major changes in this edition:</para> @@ -174,7 +174,7 @@ <quote>Appendices</quote>.</para> </listitem> <listitem> - <para><xref linkend="install"> (<quote>Installing FreeBSD</quote>) was completely + <para><xref linkend="install"> (<quote>Installing &os;</quote>) was completely rewritten with many screenshots to make it much easier for new users to grasp the text.</para> </listitem> @@ -194,7 +194,7 @@ technologies such as <application>KDE</application> and <application>GNOME</application> on &xfree86; 4.X.</para> </listitem> <listitem> - <para><xref linkend="boot"> (<quote>The FreeBSD Booting Process</quote>) has been + <para><xref linkend="boot"> (<quote>The &os; Booting Process</quote>) has been expanded.</para> </listitem> <listitem> @@ -206,7 +206,7 @@ </listitem> <listitem> <para><xref linkend="serialcomms"> (<quote>Serial Communications</quote>) has been completely - reorganized and updated for FreeBSD 4.X/5.X.</para> + reorganized and updated for &os; 4.X/5.X.</para> </listitem> <listitem> <para><xref linkend="ppp-and-slip"> (<quote>PPP and SLIP</quote>) has been substantially @@ -246,11 +246,11 @@ <para>This book is split into five logically distinct sections. The first section, <emphasis>Getting Started</emphasis>, covers - the installation and basic usage of FreeBSD. It is expected that + the installation and basic usage of &os;. It is expected that the reader will follow these chapters in sequence, possibly skipping chapters covering familiar topics. The second section, <emphasis>Common Tasks</emphasis>, covers some frequently used - features of FreeBSD. This section, and all subsequent sections, + features of &os;. This section, and all subsequent sections, can be read out of order. Each chapter begins with a succinct synopsis that describes what the chapter covers and what the reader is expected @@ -269,8 +269,8 @@ <varlistentry> <term><emphasis><xref linkend="introduction">, Introduction</emphasis></term> <listitem> - <para>Introduces FreeBSD to a new user. It describes the - history of the FreeBSD Project, its goals and development model.</para> + <para>Introduces &os; to a new user. It describes the + history of the &os; Project, its goals and development model.</para> </listitem> </varlistentry> <varlistentry> @@ -285,7 +285,7 @@ <term><emphasis><xref linkend="basics">, &unix; Basics</emphasis></term> <listitem> <para>Covers the basic commands and functionality of the - FreeBSD operating system. If you are familiar with &linux; or + &os; operating system. If you are familiar with &linux; or another flavor of &unix; then you can probably skip this chapter.</para> </listitem> @@ -294,7 +294,7 @@ <term><emphasis><xref linkend="ports">, Installing Applications</emphasis></term> <listitem> <para>Covers the installation of third-party software with - both FreeBSD's innovative <quote>Ports Collection</quote> and standard + both &os;'s innovative <quote>Ports Collection</quote> and standard binary packages.</para> </listitem> </varlistentry> @@ -302,7 +302,7 @@ <term><emphasis><xref linkend="x11">, The X Window System</emphasis></term> <listitem> <para>Describes the X Window System in general and using - X11 on FreeBSD in particular. Also describes common + X11 on &os; in particular. Also describes common desktop environments such as <application>KDE</application> and <application>GNOME</application>.</para> </listitem> </varlistentry> @@ -314,7 +314,7 @@ <listitem> <para>Lists some common desktop applications, such as web browsers and productivity suites, and describes how to install them on - FreeBSD.</para> + &os;.</para> </listitem> </varlistentry> <varlistentry> @@ -325,7 +325,7 @@ </listitem> </varlistentry> <varlistentry> - <term><emphasis><xref linkend="kernelconfig">, Configuring the FreeBSD + <term><emphasis><xref linkend="kernelconfig">, Configuring the &os; Kernel</emphasis></term> <listitem> <para>Explains why you might need to configure a new kernel @@ -336,7 +336,7 @@ <varlistentry> <term><emphasis><xref linkend="printing">, Printing</emphasis></term> <listitem> - <para>Describes managing printers on FreeBSD, including + <para>Describes managing printers on &os;, including information about banner pages, printer accounting, and initial setup.</para> </listitem> @@ -344,9 +344,9 @@ <varlistentry> <term><emphasis><xref linkend="linuxemu">, &linux; Binary Compatibility</emphasis></term> <listitem> - <para>Describes the &linux; compatibility features of FreeBSD. + <para>Describes the &linux; compatibility features of &os;. Also provides detailed installation instructions for many - popular &linux; applications such as <application>&oracle;</application>, <application>&sap.r3;</application>, and + popular &linux; applications such as <application>&oracle;</application> and <application>&mathematica;</application>.</para> </listitem> </varlistentry> @@ -357,15 +357,15 @@ <term><emphasis><xref linkend="config-tuning">, Configuration and Tuning</emphasis></term> <listitem> <para>Describes the parameters available for system - administrators to tune a FreeBSD system for optimum + administrators to tune a &os; system for optimum performance. Also describes the various configuration files - used in FreeBSD and where to find them.</para> + used in &os; and where to find them.</para> </listitem> </varlistentry> <varlistentry> <term><emphasis><xref linkend="boot">, Booting Process</emphasis></term> <listitem> - <para>Describes the FreeBSD boot process and explains + <para>Describes the &os; boot process and explains how to control this process with configuration options.</para> </listitem> </varlistentry> @@ -382,7 +382,7 @@ <term><emphasis><xref linkend="security">, Security</emphasis></term> <listitem> <para>Describes many different tools available to help keep your - FreeBSD system secure, including Kerberos, IPsec and OpenSSH.</para> + &os; system secure, including Kerberos, IPsec and OpenSSH.</para> </listitem> </varlistentry> <varlistentry> @@ -396,7 +396,7 @@ <term><emphasis><xref linkend="mac">, Mandatory Access Control</emphasis></term> <listitem> <para>Explains what Mandatory Access Control (MAC) is and how this - mechanism can be used to secure a FreeBSD system.</para> + mechanism can be used to secure a &os; system.</para> </listitem> </varlistentry> <varlistentry> @@ -411,7 +411,7 @@ <term><emphasis><xref linkend="disks">, Storage</emphasis></term> <listitem> <para>Describes how to manage storage media and filesystems - with FreeBSD. This includes physical disks, RAID arrays, + with &os;. This includes physical disks, RAID arrays, optical and tape media, memory-backed disks, and network filesystems.</para> </listitem> @@ -419,7 +419,7 @@ <varlistentry> <term><emphasis><xref linkend="geom">, GEOM</emphasis></term> <listitem> - <para>Describes what the GEOM framework in FreeBSD is and how + <para>Describes what the GEOM framework in &os; is and how to configure various supported RAID levels.</para> </listitem> </varlistentry> @@ -448,7 +448,7 @@ <varlistentry> <term><emphasis><xref linkend="l10n">, Localization</emphasis></term> <listitem> - <para>Describes how to use FreeBSD in languages other than + <para>Describes how to use &os; in languages other than English. Covers both system and application level localization.</para> </listitem> @@ -456,8 +456,8 @@ <varlistentry> <term><emphasis><xref linkend="updating-upgrading">, Updating and Upgrading &os;</emphasis></term> <listitem> - <para>Explains the differences between FreeBSD-STABLE, - FreeBSD-CURRENT, and FreeBSD releases. Describes which users + <para>Explains the differences between &os;-STABLE, + &os;-CURRENT, and &os; releases. Describes which users would benefit from tracking a development system and outlines that process. Covers the methods users may take to update their system to the latest security release.</para> @@ -478,14 +478,14 @@ <term><emphasis><xref linkend="serialcomms">, Serial Communications</emphasis></term> <listitem> <para>Explains how to connect terminals and modems to your - FreeBSD system for both dial in and dial out connections.</para> + &os; system for both dial in and dial out connections.</para> </listitem> </varlistentry> <varlistentry> <term><emphasis><xref linkend="ppp-and-slip">, PPP and SLIP</emphasis></term> <listitem> <para>Describes how to use PPP, SLIP, or PPP over Ethernet to - connect to remote systems with FreeBSD.</para> + connect to remote systems with &os;.</para> </listitem> </varlistentry> <varlistentry> @@ -501,7 +501,7 @@ <term><emphasis><xref linkend="network-servers">, Network Servers</emphasis></term> <listitem> <para>Provides detailed instructions and example configuration - files to set up your FreeBSD machine as a network filesystem + files to set up your &os; machine as a network filesystem server, domain name server, network information system server, or time synchronization server.</para> </listitem> @@ -511,7 +511,7 @@ <listitem> <para>Explains the philosophy behind software-based firewalls and provides detailed information about the configuration of the - different firewalls available for FreeBSD.</para> + different firewalls available for &os;.</para> </listitem> </varlistentry> <varlistentry> @@ -527,11 +527,11 @@ <!-- Part V - Appendices --> <varlistentry> - <term><emphasis><xref linkend="mirrors">, Obtaining FreeBSD </emphasis></term> + <term><emphasis><xref linkend="mirrors">, Obtaining &os; </emphasis></term> <listitem> - <para>Lists different sources for obtaining FreeBSD media on CDROM + <para>Lists different sources for obtaining &os; media on CDROM or DVD as well as different sites on the Internet that allow - you to download and install FreeBSD.</para> + you to download and install &os;.</para> </listitem> </varlistentry> <varlistentry> @@ -546,15 +546,15 @@ <varlistentry> <term><emphasis><xref linkend="eresources">, Resources on the Internet</emphasis></term> <listitem> - <para>Describes the many forums available for FreeBSD users to + <para>Describes the many forums available for &os; users to post questions and engage in technical conversations about - FreeBSD.</para> + &os;.</para> </listitem> </varlistentry> <varlistentry> <term><emphasis><xref linkend="pgpkeys">, PGP Keys</emphasis></term> <listitem> - <para>Lists the PGP fingerprints of several FreeBSD Developers.</para> + <para>Lists the PGP fingerprints of several &os; Developers.</para> </listitem> </varlistentry> </variablelist> @@ -646,7 +646,7 @@ <screen><prompt>E:\></prompt> <userinput>tools\fdimage floppies\kern.flp A:</userinput></screen> <para>Examples starting with &prompt.root; indicate a command that - must be invoked as the superuser in FreeBSD. You can login as + must be invoked as the superuser in &os;. You can login as <username>root</username> to type the command, or login as your normal account and use &man.su.1; to gain superuser privileges.</para> @@ -672,7 +672,7 @@ document by paying authors to work on it full-time, paying for publication, etc. In particular, BSDi (subsequently acquired by <ulink url="http://www.windriver.com">Wind River Systems</ulink>) - paid members of the FreeBSD Documentation Project to work on + paid members of the &os; Documentation Project to work on improving this book full time leading up to the publication of the first printed edition in March 2000 (ISBN 1-57176-241-8). Wind River Systems then paid several additional authors to make a @@ -680,7 +680,7 @@ additional chapters to the text. This work culminated in the publication of the second printed edition in November 2001 (ISBN 1-57176-303-1). In 2003-2004, <ulink - url="http://www.freebsdmall.com">FreeBSD Mall, Inc</ulink>, paid + url="http://www.freebsdmall.com">&os; Mall, Inc</ulink>, paid several contributors to improve the Handbook in preparation for the third printed edition.</para> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#97 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1088 2010/12/05 22:12:43 das Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1092 2010/12/30 06:24:10 miwi Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -86,6 +86,12 @@ typing <command>:set tabstop=4</command> once the file has been loaded.</para> </note> + + <para> + Looking for something easy to start with? Take a look at the + <ulink url="http://wiki.freebsd.org/WantedPorts">list of + requested ports</ulink> and see if you can work on one (or more). + </para> </chapter> <chapter id="quick-porting"> @@ -3292,9 +3298,9 @@ <para>The COMMENT variable should immediately follow the MAINTAINER variable in the <filename>Makefile</filename>.</para> - <para>Please try to keep the COMMENT line less than 70 - characters, as it is displayed to users as a one-line - summary of the port.</para> + <para>Please try to keep the COMMENT line less than 60 + characters, as this line will be used by the &man.pkg.info.1; + utility to display a one-line summary of the port.</para> </sect1> <sect1 id="makefile-depend"> @@ -4163,22 +4169,15 @@ </sect1> <sect1 id="conflicts"> - <title><makevar>CONFLICTS</makevar></title> + <title>Conflict handling</title> - <para>If your package cannot coexist with other packages - (because of file conflicts, runtime incompatibility, etc.), - list the other package names in the <makevar>CONFLICTS</makevar> - variable. You can use shell globs like <literal>*</literal> and - <literal>?</literal> here. Packages names should be - enumerated the same way they appear in - <filename>/var/db/pkg</filename>. Please make sure that - <makevar>CONFLICTS</makevar> does not match this port's - package itself, or else forcing its installation with - <makevar>FORCE_PKG_REGISTER</makevar> will no longer work. - </para> + <para>There are tree different variables to register a conflict + between packages and ports: <makevar>CONFLICTS</makevar>, + <makevar>CONFLICTS_INSTALL</makevar> and + <makevar>CONFLICTS_BUILD</makevar>.</para> <note> - <para><makevar>CONFLICTS</makevar> automatically sets + <para>The conflict variables automatically set the variable <makevar>IGNORE</makevar>, which is more fully documented in <xref linkend="dads-noinstall">.</para> </note> @@ -4187,6 +4186,53 @@ retain the <makevar>CONFLICTS</makevar> entries in those other ports for a few months to cater for users who only update once in a while.</para> + + <sect2> + <title><makevar>CONFLICTS_INSTALL</makevar></title> + + <para>If your package cannot coexist with other packages + (because of file conflicts, runtime incompatibilities, etc.), + list the other package names in the + <makevar>CONFLICTS_INSTALL</makevar> variable. You can use shell + globs like <literal>*</literal> and <literal>?</literal> here. + Packages names should be enumerated the same way they appear in + <filename>/var/db/pkg</filename>. Please make sure that + <makevar>CONFLICTS_INSTALL</makevar> does not match this port's + package itself. Otherwise enforcing its installation with + <makevar>FORCE_PKG_REGISTER</makevar> will no longer work. + The CONFLICTS_INSTALL check is done after the build stage and + prior to the install stage.</para> + </sect2> + + <sect2> + <title><makevar>CONFLICTS_BUILD</makevar></title> + + <para>If your port cannot be built if a certain port is already + installed, list the other port names in the + <makevar>CONFLICTS_BUILD</makevar> variable. You can use shell + globs like <literal>*</literal> and <literal>?</literal> here. + Packages names should be enumerated the same way they appear in + <filename>/var/db/pkg</filename>. The CONFLICTS_BUILD check is + done prior to the build stage. Build conflicts are not recorded + in the resulting package.</para> + </sect2> + + <sect2> + <title><makevar>CONFLICTS</makevar></title> + + <para>If your port cannot be built if a certain port is already + installed and the resulting package cannot coexist with the + other package, list the other package name in the + <makevar>CONFLICTS</makevar> variable. You can use shell + globs like <literal>*</literal> and <literal>?</literal> here. + Packages names should be enumerated the same way they appear in + <filename>/var/db/pkg</filename>. Please make sure that + <makevar>CONFLICTS_INSTALL</makevar> does not match this port's + package itself. Otherwise enforcing its installation with + <makevar>FORCE_PKG_REGISTER</makevar> will no longer work. + The CONFLICTS check is done prior to the build stage and prior to + the install stage.</para> + </sect2> </sect1> <sect1 id="install"> @@ -12948,6 +12994,18 @@ </row> <row> + <entry>704000</entry> + <entry>December 22, 2010</entry> + <entry>7.4-RELEASE</entry> + </row> + + <row> + <entry>704100</entry> + <entry>December 22, 2010</entry> + <entry>7.4-STABLE after 7.4-RELEASE.</entry> + </row> + + <row> <entry>800000</entry> <entry>October 11, 2007</entry> <entry>8.0-CURRENT. Separating wide and single byte @@ -13730,6 +13788,16 @@ pl_siginfo for ptrace(PT_LWPINFO) .</entry> </row> <row> + <entry>802000</entry> + <entry>December 22, 2010</entry> + <entry>8.2-RELEASE</entry> + </row> + <row> + <entry>802500</entry> + <entry>December 22, 2010</entry> + <entry>8.2-STABLE after 8.2-RELEASE.</entry> + </row> + <row> <entry>900000</entry> <entry>August 22, 2009</entry> <entry>9.0-CURRENT.</entry> ==== //depot/projects/docproj_nl/share/pgpkeys/ache.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/share/pgpkeys/ache.key,v 1.7 2006/12/26 18:31:35 ache Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/ache.key,v 1.9 2010/12/24 08:23:14 ache Exp $ --> <!-- sh addkey.sh ache 964474DD; --> @@ -11,7 +11,7 @@ ]]></programlisting> <programlisting role="pgpkey"><