Date: Thu, 25 Aug 2011 20:02:48 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 198148 for review Message-ID: <201108252002.p7PK2m4o004701@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@198148?ac=10 Change 198148 by rene@rene_acer on 2011/08/25 20:02:18 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#101 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#38 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#25 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#24 integrate .. //depot/projects/docproj_nl/www/en/layout/js/google.js#2 integrate .. //depot/projects/docproj_nl/www/en/portmgr/policies_contributors.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/search/web.atoz#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#114 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#101 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1011 2011/08/18 03:46:44 eadler Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1012 2011/08/20 14:12:07 rene Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 (text+ko) ==== @@ -28,7 +28,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.11 2010/07/31 11:12:17 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.12 2011/08/25 14:02:07 gabor Exp $ --> <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -54,7 +54,7 @@ <holder role="mailto:dru@isecom.org">Dru Lavigne</holder> </copyright> - <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.11 2010/07/31 11:12:17 pgj Exp $</releaseinfo> + <releaseinfo>$FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.12 2011/08/25 14:02:07 gabor Exp $</releaseinfo> <legalnotice id="trademarks" role="trademarks"> &tm-attrib.freebsd; @@ -99,7 +99,15 @@ <para>&os; is a complete operating system (kernel and userland) with a well-respected heritage grounded in the - roots of Unix development.[1] Since both the kernel and the + roots of Unix development. + + <footnote> + <para>See also <ulink + url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"></ulink>; + for a brief history.</para> + </footnote> + + Since both the kernel and the provided utilities are under the control of the same release engineering team, there is less likelihood of library incompatibilities. Security vulnerabilities can also be @@ -145,7 +153,15 @@ restrictions on the distribution of GPLd code. In contrast, the BSD license places no such restrictions, which gives you the flexibility of keeping the code Open Source or closing - the code for a proprietary commercial product.[2] Having + the code for a proprietary commercial product. + + <footnote> + <para>For a fairly unbiased view of the merits of each + license, see <ulink + url="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing"></ulink>.</para>; + </footnote> + + Having stable and reliable code under the attractive BSD license means that many operating systems, such as <ulink url="http://developer.apple.com/darwin/projects/darwin/faq.html">Apple OS X</ulink> are based on FreeBSD code. It also means that if you choose @@ -192,7 +208,15 @@ operating system! It supports the X Window System, the same one used in &linux; distributions to provide a desktop user interface. It also supports over 13,000 easy to install - third-party applications,[3] including KDE, Gnome, and + third-party applications, + + <footnote> + <para>Using <ulink url="&url.base;/ports">FreeBSD's ports + collection</ulink>: software installation is as easy as + <command>pkg_add -r application_name</command>.</para> + </footnote> + + including KDE, Gnome, and OpenOffice.</para> <para>Several projects are available to ease the installation of @@ -483,14 +507,30 @@ and Unix skillsets to FreeBSD administration.</para></listitem> <listitem><para>In-house developers have full access to all - FreeBSD code[4] for all releases going back to the original + FreeBSD code + + <footnote> + <para>In addition, all code is browsable through a + web-interface: <ulink + url="http://www.FreeBSD.org/cgi/cvsweb.cgi/"></ulink>.</para>; + </footnote> + + for all releases going back to the original &os; release. Included with the code are all of the log messages which provide context to changes and bug fixes. Additionally, a developer can easily replicate any release by simply checking out the code with the desired label. In contrast, &linux; traditionally didn't follow this model, but has recently adopted a more mature development - model. [5]</para></listitem> + model. + + <footnote> + <para>An interesting overview of the evolving Linux + development model can be found at <ulink + url="http://linuxdevices.com/articles/AT4155251624.html"></ulink>.</para>; + </footnote> + + </para></listitem> <listitem><para>In-house developers also have full access to FreeBSD's <ulink @@ -516,33 +556,4 @@ in their existing infrastructure, &os; is an excellent choice indeed.</para> </sect1> - - <sect1 id="freebsd-addenda"> - <title>Addenda</title> - - <orderedlist> - - <listitem><para>See also <ulink - url="http://www.oreilly.com/catalog/opensources/book/kirkmck.html"></ulink>; - for a brief history.</para></listitem> - - <listitem><para>For a fairly unbiased view of the merits of each - license, see <ulink - url="http://en.wikipedia.org/wiki/BSD_and_GPL_licensing"></ulink>.</para></listitem>; - - <listitem><para>Using <ulink - url="&url.base;/ports">FreeBSD's ports - collection</ulink>: software installation is as easy as - <command>pkg_add -r application_name</command>.</para></listitem> - - <listitem><para>In addition, all code is browsable through a - web-interface: <ulink - url="http://www.FreeBSD.org/cgi/cvsweb.cgi/"></ulink>.</para></listitem>; - - <listitem><para>An interesting overview of the evolving Linux - development model can be found at <ulink - url="http://linuxdevices.com/articles/AT4155251624.html"></ulink>.</para></listitem>; - - </orderedlist> - </sect1> </article> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#38 (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.1138 2011/06/10 13:03:29 bcr Exp $</pubdate> + <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1139 2011/08/21 14:34:03 simon Exp $</pubdate> <copyright> <year>1995</year> @@ -2356,41 +2356,8 @@ <answer> <para>Any SCSI drive connected to a supported controller is + supported. Most ATAPI compatible IDE CD-ROMs are supported.</para> - - <para>The following proprietary CD-ROM interfaces are also - supported:</para> - - <itemizedlist> - <listitem> - <para>Mitsumi LU002 (8-bit), LU005 (16-bit) and FX001D - (16-bit 2x Speed).</para> - </listitem> - - <listitem> - <para>Sony CDU 31/33A</para> - </listitem> - - <listitem> - <para>Sound Blaster Non-SCSI CD-ROM</para> - </listitem> - - <listitem> - <para>Matsushita/Panasonic CD-ROM</para> - </listitem> - - <listitem> - <para>ATAPI compatible IDE CD-ROMs</para> - </listitem> - </itemizedlist> - - <para>All non-SCSI cards are known to be extremely slow - compared to SCSI drives, and some ATAPI CD-ROMs may not - work.</para> - - <para>The official &os; CD-ROM ISO, and CD-ROMs from Daemon - News and &os; Mall, support booting directly from the - CD.</para> </answer> </qandaentry> @@ -2410,66 +2377,6 @@ your kernel.</para> </answer> </qandaentry> - - <qandaentry> - <question id="zip-support"> - <para>Does &os; support &iomegazip; drives?</para> - </question> - - <answer> - <para>&os; supports SCSI and ATAPI (IDE) &iomegazip; drives - out of the box. SCSI ZIP drives can only be set to run at - SCSI target IDs 5 or 6, but if your SCSI host adapter's - BIOS supports it you can even boot from it. It is not - clear which host adapters support booting from targets - other than 0 or 1, so you will have to consult your - adapter's documentation if you would like to use this - feature.</para> - - <para>&os; also supports Parallel Port Zip Drives. Check - that your kernel contains the - <devicename>scbus0</devicename>, - <devicename>da0</devicename>, - <devicename>ppbus0</devicename>, and - <devicename>vp0</devicename> drivers (the - <filename>GENERIC</filename> kernel contains everything - except <devicename>vp0</devicename>). With all these - drivers present, the Parallel Port drive should be available - as <devicename>/dev/da0s4</devicename>. Disks can be - mounted using <command>mount /dev/da0s4 /mnt</command> OR - (for DOS disks) <command>mount -t msdosfs /dev/da0s4 /mnt</command> - as appropriate.</para> - - <para>Also check out <link linkend="media-change">the FAQ on - removable drives</link> later in this chapter, and <link - linkend="removable-drives">the note on - <quote>formatting</quote></link>in the Administration - chapter.</para> - </answer> - </qandaentry> - - <qandaentry> - <question id="jaz-zip-removable-support"> - <para>Does &os; support &jaz;, EZ and other removable - drives?</para> - </question> - - <answer> - <para>They work. Most of these are SCSI devices, so they - look like SCSI disks to &os;. The IDE EZ looks like an IDE - drive.</para> - - <para>Make sure that any external units are powered on when - booting the system.</para> - - <para><anchor id="media-change">To change the media while - running, check out &man.mount.8;, &man.umount.8;, and - &man.camcontrol.8; (for SCSI devices) or &man.atacontrol.8; - (for IDE devices), plus the <link - linkend="removable-drives">discussion on using removable drives</link> - later in the FAQ.</para> - </answer> - </qandaentry> </qandaset> </sect1> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.254 2011/05/22 18:49:23 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.255 2011/08/23 18:40:43 brueffer Exp $ --> <chapter id="updating-upgrading"> @@ -3073,7 +3073,7 @@ <para>A prompt is displayed before deleting each obsolete file. You can skip the prompt and let the system remove these files automatically by using the <makevar>BATCH_DELETE_OLD_FILES</makevar> make-variable as - follows:<para> + follows:</para> <screen>&prompt.root; <userinput>make -DBATCH_DELETE_OLD_FILES delete-old</userinput></screen> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#25 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.110 2011/08/07 12:37:58 rene Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.111 2011/08/25 11:33:22 ryusuke Exp $ --> <chapter id="desktop"> @@ -181,7 +181,7 @@ <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen> - <para>This will install <application>Firefox</application> 5.0, + <para>This will install <application>Firefox</application> 6.0, if you want to run <application>Firefox</application> 3.6, use instead:</para> ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#24 (text+ko) ==== @@ -33,8 +33,7 @@ # BSDI Id: bsdi-man,v 1.2 1995/01/11 02:30:01 polk Exp # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # -# $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.261 2011/03/29 21:54:40 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.265 2011/08/21 12:35:12 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -145,26 +144,30 @@ 'CentOS Linux/i386 3.9' => { 'path' => '1:2:3:3p:4:5:6:7:8:9:n', }, 'CentOS Linux/i386 4.8' => { 'path' => '1:1p:2:3:3p:4:5:6:7:8:9:n:0p', }, - 'CentOS Linux/i386 5.4' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, - 'CentOS Linux/i386 5.5' => { 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', }, + 'CentOS Linux/i386 5.4' => { + 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', + }, + 'CentOS Linux/i386 5.5' => { + 'path' => '0p:1:1p:1x:2:2x:3:3p:3x:4:4x:5:5x:6:6x:7:7x:8:8x:9:9x:l:n', + }, - 'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 5.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 6.4' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 7.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 8.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 9.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, - 'SuSE Linux/i386 9.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 4.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 5.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 6.4' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 7.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 8.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 9.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, + 'SuSE Linux/i386 9.3' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.0' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.1' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, 'SuSE Linux/i386 10.2' => { 'path' => '0p:1:1p:2:3:3p:4:5:6:7:8:9:n:s', }, @@ -210,30 +213,41 @@ "$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-6.2-RELEASE", 'FreeBSD Ports', "$manLocalDir/FreeBSD-ports", - 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 9-current', +"$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", - 'FreeBSD 8.2-stable', "$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", - 'FreeBSD 8.2-RELEASE', "$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man", + 'FreeBSD 8.2-stable', +"$manLocalDir/FreeBSD-8.2-stable/man:$manLocalDir/FreeBSD-8.2-stable/openssl/man", + 'FreeBSD 8.2-RELEASE', +"$manLocalDir/FreeBSD-8.2-RELEASE/man:$manLocalDir/FreeBSD-8.2-RELEASE/openssl/man", 'FreeBSD Ports 8.2-RELEASE', "$manLocalDir/FreeBSD-ports-8.2-RELEASE", - - 'FreeBSD 8.1-RELEASE', "$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", - 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", + + 'FreeBSD 8.1-RELEASE', +"$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", + 'FreeBSD 8.0-RELEASE', +"$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", 'FreeBSD Ports 8.1-RELEASE', "$manLocalDir/FreeBSD-ports-8.1-RELEASE", 'FreeBSD Ports 8.0-RELEASE', "$manLocalDir/FreeBSD-ports-8.0-RELEASE", - 'FreeBSD 7.4-stable', "$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", - 'FreeBSD 7.4-RELEASE', "$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", + 'FreeBSD 7.4-stable', +"$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", + 'FreeBSD 7.4-RELEASE', +"$manLocalDir/FreeBSD-7.4-RELEASE/man:$manLocalDir/FreeBSD-7.4-RELEASE/openssl/man", 'FreeBSD Ports 7.4-RELEASE', "$manLocalDir/FreeBSD-ports-7.4-RELEASE", - - 'FreeBSD 7.3-RELEASE', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", + + 'FreeBSD 7.3-RELEASE', +"$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", 'FreeBSD Ports 7.3-RELEASE', "$manLocalDir/FreeBSD-ports-7.3-RELEASE", - 'FreeBSD 7.2-RELEASE', "$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", - 'FreeBSD 7.1-RELEASE', "$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", + 'FreeBSD 7.2-RELEASE', +"$manLocalDir/FreeBSD-7.2-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man", + 'FreeBSD 7.1-RELEASE', +"$manLocalDir/FreeBSD-7.1-RELEASE/man:$manLocalDir/FreeBSD-7.1-RELEASE/openssl/man", 'FreeBSD Ports 7.1-RELEASE', "$manLocalDir/FreeBSD-ports-7.1-RELEASE", - 'FreeBSD 7.0-RELEASE', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", + 'FreeBSD 7.0-RELEASE', +"$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", 'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE", 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable", @@ -392,10 +406,10 @@ 'Red Hat Linux/i386 8.0', "$manLocalDir/RedHat-8.0-i386", 'Red Hat Linux/i386 9', "$manLocalDir/RedHat-9-i386", - 'CentOS Linux/i386 3.9', "$manLocalDir/CentOS-3.9", - 'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8", - 'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4", - 'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5", + 'CentOS Linux/i386 3.9', "$manLocalDir/CentOS-3.9", + 'CentOS Linux/i386 4.8', "$manLocalDir/CentOS-4.8", + 'CentOS Linux/i386 5.4', "$manLocalDir/CentOS-5.4", + 'CentOS Linux/i386 5.5', "$manLocalDir/CentOS-5.5", 'SuSE Linux/i386 4.3', "$manLocalDir/SuSE-4.3-i386", 'SuSE Linux/i386 5.0', "$manLocalDir/SuSE-5.0-i386", @@ -523,6 +537,17 @@ my %no_pdf_output = map { $_ => 1 } @no_pdf_output; +my %valid_arch = map { $_ => 1 } + qw/acorn26 acorn32 algor alpha amd64 amiga arc arm arm26 arm32 armish atari aviion bebox cats cesfic cobalt dreamcast evbarm evbmips evbppc evbsh3 evbsh5 hp300 hp700 hpcarm hpcmips hpcsh hppa hppa64 i386 ibmnws landisk loongson luna68k luna88k mac68k macppc mipsco mmeye mvme68k mvme88k mvmeppc netwinder news68k newsmips next68k ofppc palm pc532 pegasos playstation2 pmax pmppc powerpc prep sandpoint sbmips sgi sgimips shark socppc sparc sparc64 sun2 sun3 sun3x tahoe vax walnut wgrisc x68k zaurus/; + +my $default_arch = 'i386'; + +my %arch = ( +'FreeBSD 8.2-RELEASE' => { 'default' => 'i386', 'arch' => [qw/amd64 arm i386 powerpc sparc64/] } , +'NetBSD 5.1' => { 'arch' => [qw/acorn26 acorn32 alpha amiga arc atari cobalt dreamcast evbarm evbmips evbppc hp300 hp700 hpcarm hpcmips hpcsh i386 mac68k macppc mvme68k pmax prep sgimips sparc sparc64 sun2 sun3 vax x68k/] } , +'OpenBSD 4.7' => { 'arch' => [qw/alpha amd64 armish aviion hp300 hppa hppa64 i386 landisk loongson luna88k mac68k macppc mvme68k mvme88k mvmeppc palm sgi socppc sparc sparc64 vax zaurus/] }, +); + # delete not existing releases while ( ( $key, $val ) = each %manPath ) { my $counter = 0; @@ -611,6 +636,7 @@ # sort by characters else { + # minor number and characters # 4.1 RELEASE <=> 4.1.1 RELEASE if ( $flag && ( $a1 =~ /^\d+$/ || $b1 =~ /^\d+$/ ) ) { @@ -731,6 +757,19 @@ $format = $form{'format'}; $format = 'html' if $format !~ /^(ps|pdf|ascii|latin1)$/; + $arch = $form{'arch'} || ""; + $arch = '' if $arch eq 'none' || $arch eq 'default'; + if ( $arch =~ /^([a-zA-Z0-9]+)$/ && $valid_arch{$arch} ) { + $arch = $1; + } + elsif ($arch) { + warn "Unknown arch: '$arch', ignored\n"; + $arch = ""; + } + else { + $arch = ""; + } + # remove trailing spaces for dumb users $form{'query'} =~ s/\s+$//; $form{'query'} =~ s/^\s+//; @@ -793,7 +832,7 @@ } else { $section = ''; } - $apropos ? &apropos($query) : &man( $name, $section ); + $apropos ? &apropos($query) : &man( $name, $section, $arch ); } # --------------------- support routines ------------------------ @@ -943,7 +982,7 @@ } sub man { - local ( $name, $section ) = @_; + local ( $name, $section, $arch ) = @_; local ( $_, $title, $head, *MAN ); local ( $html_name, $html_section, $prefix ); local (@manargs); @@ -1070,6 +1109,8 @@ warn "X $command{'man'} @manargs -- x $name x\n" if $debug >= 3; + push( @manargs, ( "-m", $arch ) ) if $arch; + &proc( *MAN, $command{'man'}, @manargs, "--", $name ) || &mydie("$0: open of $command{'man'} command failed: $!\n"); if ( eof(MAN) ) { @@ -1449,9 +1490,32 @@ . qq{value="$key">$key</option>\n}; } + print qq{</select>\n}; + print qq{<select name="arch">\n}; + my @arch = exists $arch{$l} ? @{ $arch{$l}->{'arch'} } : $default_arch; + unshift @arch, 'default'; + + my $a; + # machine type selected by user + if ($arch) { + $a = $arch; + } + + # pickup a default machine type + else { + exists $arch{$l}->{'default'} ? $arch{$l}->{'default'} : 'default'; + } + + foreach (@arch) { + my $selected = $_ eq $a ? ' selected="selected"' : ""; + print qq{<option $selected value="$_">$_</option>\n}; + } + + print qq{</select>\nArchitecture\n\n}; + local ($m) = &encode_url($l); + print <<ETX; -</select> <br /> <input name="apropos" value="1" type="radio"$bstring /> <a href="$BASE?query=apropos&sektion=1&apropos=0">Apropos</a> Keyword Search (all sections) <select name="format"> @@ -1502,7 +1566,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.261 2011/03/29 21:54:40 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.265 2011/08/21 12:35:12 wosch Exp $'; return qq{\ <pre> Copyright (c) 1996-2011 <a href="$mailtoURL">Wolfram Schneider</a> ==== //depot/projects/docproj_nl/www/en/layout/js/google.js#2 (text+ko) ==== @@ -1,21 +1,46 @@ -/* $FreeBSD: www/en/layout/js/google.js,v 1.6 2011/08/17 21:40:30 gjb Exp $ */ +/* $FreeBSD: www/en/layout/js/google.js,v 1.7 2011/08/20 23:47:06 gjb Exp $ */ var h=document.location.host; /* * Check that the hosting domain is actually a FreeBSD.org domain, so * we don't accidentally obtain data from mirrors. */ -var fbsdregex=/(docs|www|wiki)\.freebsd\.org/i; +var fbsdregex=/(docs|security|svnweb|wiki|www)\.freebsd\.org/i; if (fbsdregex.test(h)) { var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-22767463-1']); + _gaq.push(['_setDomainName', 'freebsd.org']); + _gaq.push(['_setAllowHash', false]); + /* + * If we ever want to track sites other than FreeBSD.org, + * uncomment the next line. + */ + //_gaq.push(['_setAllowLinker', true]); + // This is what we track _gaq.push(['_trackPageview']); + _gaq.push(['_trackPageLoadTime']); _gaq.push(['_setCustomVar', - 5, // use the last index in case we just don't care ;-) + /* + * This is the last available 'slot', and can be adjusted + * if needed; 1 through 5 are available, so we can add more + * custom variables if needed. + */ + 5, + /* + * This is the custom name to what this custom variable + * will be reported as. + */ 'Real Operating System', + /* + * Try to track what operating systems are used to visit + * the site. + */ navigator.platform, - 1 // Lets track this by 'visitor' (per cookie). If we need more - // fine grained data we could always change it later + /* + * Tracking is done per cookie to try to identify unique + * visitors. + */ + 1 ]); (function() { ==== //depot/projects/docproj_nl/www/en/portmgr/policies_contributors.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ <!ENTITY base CDATA ".."> -<!ENTITY date "$FreeBSD: www/en/portmgr/policies_contributors.sgml,v 1.2 2006/08/19 21:20:41 hrs Exp $"> +<!ENTITY date "$FreeBSD: www/en/portmgr/policies_contributors.sgml,v 1.3 2011/08/20 18:35:40 linimon Exp $"> <!ENTITY title "Policies of the Ports Management Team: Maintainers and Committers"> <!ENTITY % navinclude.about "INCLUDE"> ]> @@ -19,7 +19,11 @@ commit the change. If it is a major change (e.g. would require a regression run), please contact portmgr first.</p> -<p>Since GNATS does not automatically notify maintainers of PRs, please +<p>We have an add-on to the GNATS database known as the auto-assigner, + which attempts to automatically notify maintainers of PRs; however, + it depends on the Synopsis containing category/portname. In general, + various people attempt to catch and fix cases where it does not work, + but you should not assume so. Therefore, please check to see whether or not the maintainer knows about the PR before declaring a timeout. You can generally tell this from the Audit-Trail and Cc: lines in the PR.</p> @@ -27,9 +31,8 @@ <a name="maintainer_reset"></a> <h3>Maintainer Reset</h3> -<p>The time limit for a maintainer to respond to port problems (such - as build errors, PRs, and needed updates) is three months. After that - period, any ports committer can reset the maintainer. If you are +<p>A maintainer who does not respond to any port issues for 3 months may + be reset by any ports committer. If you are a committer and concerned about whether you are doing the right thing, please contact portmgr.</p> @@ -41,8 +44,8 @@ <a name="commit_privileges"></a> <h3>Commit Privileges</h3> -<p>The time limit for a committer to keep commit rights within the - ports tree ("commit bit") is one year. portmgr will contact the +<p>Ports committers who are not active for one year will lose commit + privileges. portmgr will contact the committer by email before invoking this limit.</p> &footer ; ==== //depot/projects/docproj_nl/www/en/search/web.atoz#7 (text+ko) ==== @@ -4,7 +4,7 @@ # With the format `<title>|<url>'. # Empty lines or comments are ignored. # -# $FreeBSD: www/en/search/web.atoz,v 1.95 2011/06/17 13:24:41 ryusuke Exp $ +# $FreeBSD: www/en/search/web.atoz,v 1.96 2011/08/22 16:42:02 ryusuke Exp $ # # NOTE: the entries should be sorted alphabetically by their relative # path to www/en. E.g. docs/man.sgml comes after docs/books.sgml, @@ -511,8 +511,6 @@ Logo design competition|http://logo-contest.FreeBSD.org/ # News -BSD News|http://bsdnews.com -Daemon News|http://www.daemonnews.org/ # Security Advisories Security Advisories|http://security.freebsd.org ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#114 (text+ko) ==== @@ -25,7 +25,7 @@ <news> <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0"> <cvs:keyword name="freebsd"> - $FreeBSD: www/share/sgml/news.xml,v 1.389 2011/08/18 04:24:11 eadler Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.390 2011/08/24 13:52:32 jkois Exp $ </cvs:keyword> </cvs:keywords> @@ -44,6 +44,19 @@ </day> <day> + <name>9</name> + + <event> + <title>&os; Foundation August 2011 Newsletter</title> + + <p>The &os; Foundation has published their first <a + href="http://www.freebsdfoundation.org/press/2011Aug-newsletter.shtml">Semi-Annual + 2011 newsletter</a> which summarizes what they + have done to help the &os; Project and community.</p> + </event> + </day> + + <day> <name>1</name> <event>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108252002.p7PK2m4o004701>