Date: Sun, 3 Apr 2011 19:22:38 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 190980 for review Message-ID: <201104031922.p33JMcRt050712@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@190980?ac=10 Change 190980 by rene@rene_acer on 2011/04/03 19:22:08 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#61 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#103 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#55 integrate .. //depot/projects/docproj_nl/share/pgpkeys/art.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/avg.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ed.key#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#53 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#50 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#25 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#23 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#54 integrate .. //depot/projects/docproj_nl/www/en/projects/2011-freebsd-gsoc.jpg#1 branch .. //depot/projects/docproj_nl/www/en/projects/2011-freebsd-gsoc.pdf#1 branch .. //depot/projects/docproj_nl/www/en/projects/Makefile#4 integrate .. //depot/projects/docproj_nl/www/en/projects/ideas/ideas.xsl#4 integrate .. //depot/projects/docproj_nl/www/en/projects/summerofcode.xsl#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/header.ent#8 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#10 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#106 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#61 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.320 2011/03/18 08:56:52 sbz Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.321 2011/04/02 00:03:40 art Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -107,6 +107,10 @@ </listitem> <listitem> + <para>&a.art;</para> + </listitem> + + <listitem> <para>&a.kib;</para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#20 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.103 2011/03/22 13:35:13 chinsan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.105 2011/03/28 08:48:54 bcr Exp $ --> <chapter id="desktop"> @@ -171,32 +171,37 @@ </indexterm> <para><application>Firefox</application> is a modern, free, - open-source stable browser that is fully ported to &os;: it - features a very standards-compliant HTML display engine, - tabbed browsing, popup blocking, extensions, improved - security, and more. <application>Firefox</application> is - based on the <application>Mozilla</application> - codebase.</para> + open-source stable browser that is fully ported to &os;: it + features a very standards-compliant HTML display engine, + tabbed browsing, popup blocking, extensions, improved + security, and more. <application>Firefox</application> is + based on the <application>Mozilla</application> codebase.</para> <para>Install the package by typing:</para> <screen>&prompt.root; <userinput>pkg_add -r firefox</userinput></screen> - <para>This will install <application>Firefox</application> 3.6, - if you want to run <application>Firefox</application> 3.5, - use instead:</para> + <para>This will install <application>Firefox</application> 4.0, + if you want to run <application>Firefox</application> 3.6, + use instead:</para> + + <screen>&prompt.root; <userinput>pkg_add -r firefox36</userinput></screen> + + <para>If you want to run <application>Firefox</application> 3.5, + use instead:</para> <screen>&prompt.root; <userinput>pkg_add -r firefox35</userinput></screen> <para>You can also use the Ports Collection if you - prefer to compile from source code:</para> + prefer to compile from source code:</para> <screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput> &prompt.root; <userinput>make install clean</userinput></screen> - <para>For <application>Firefox</application> 3.5, in the - previous command replace <literal>firefox</literal> with - <literal>firefox35</literal>.</para> + <para>For <application>Firefox</application> 3.6, in the + previous command replace <literal>firefox</literal> with + <literal>firefox36</literal>. For <application>Firefox</application> + 3.5 use <literal>firefox35</literal> instead.</para> </sect2> <sect2 id="moz-java-plugin"> @@ -275,7 +280,7 @@ </step> <step> - <title>For Firefox 3.6</title> + <title>For Firefox 3.6 and 4.0</title> <para>Install <application>OpenJDK 6</application> through the Ports Collection by typing:</para> @@ -794,8 +799,8 @@ <note> <para>During the first launch, you will be asked some - questions and a <filename>.libreoffice</filename> folder - will be created in your home directory.</para> + questions and a <filename class="directory">.libreoffice</filename> + folder will be created in your home directory.</para> </note> <para>If the <application>LibreOffice</application> packages ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.420 2011/02/22 20:57:42 jkois Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.423 2011/03/31 10:01:51 ryusuke Exp $ --> <chapter id="install"> @@ -708,7 +708,7 @@ <title>Acquire the Boot Floppy Images</title> <important> - <para>Please note, as of &os; 8.0, floppy disk images are + <para>Please note, as of &os; 8.<replaceable>X</replaceable>, floppy disk images are no longer available. Please see above for instructions on how to install &os; using a USB memory stick or just use a CDROM or a DVD.</para> @@ -895,7 +895,7 @@ opportunity.</para> <note> - <para>For &os; 7.3 and previous versions, installation + <para>For &os; 7.<replaceable>X</replaceable>, installation boot floppies are available and can be prepared as described in <xref linkend="install-boot-media">. One of them will be the first boot disc: @@ -3041,8 +3041,8 @@ <title>Linux Compatibility</title> <note> - <para>This part only applies to &os; 7.X installation, if - you install &os; 8.X this screen will not be + <para>This part only applies to &os; 7.<replaceable>X</replaceable> installation, if + you install &os; 8.<replaceable>X</replaceable> this screen will not be proposed.</para> </note> @@ -4369,11 +4369,11 @@ <para>From the &os; system where is saved the installation ISO image, for example - <filename>&os;-<replaceable>8.1</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso</filename>, + <filename>&os;-<replaceable>&rel.current;</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso</filename>, use the &man.tar.1; utility to extract all the files:</para> <screen>&prompt.root; <userinput>mkdir <replaceable>/path/to/headless-iso</replaceable></userinput> -&prompt.root; <userinput>tar -C <replaceable>/path/to/headless-iso</replaceable> -pxvf &os;-<replaceable>8.1</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso</userinput></screen> +&prompt.root; <userinput>tar -C <replaceable>/path/to/headless-iso</replaceable> -pxvf &os;-<replaceable>&rel.current;</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso</userinput></screen> <para>Now you must set the installation media to boot into a serial console. You have to add to the @@ -4389,7 +4389,7 @@ used:</para> <screen>&prompt.root; <userinput>mkisofs -v -b boot/cdboot -no-emul-boot -r -J -V "<replaceable>Headless_install</replaceable>" \ - -o <replaceable>Headless-</replaceable>&os;-<replaceable>8.1</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso <replaceable>/path/to/headless-iso</replaceable></userinput></screen> + -o <replaceable>Headless-</replaceable>&os;-<replaceable>&rel.current;</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso <replaceable>/path/to/headless-iso</replaceable></userinput></screen> <para>Now that you have your ISO image configured correctly, you can burn it on a CD-R with your favorite burning @@ -4430,7 +4430,7 @@ <screen>&prompt.root; <userinput>cu -l /dev/cuau0</userinput></screen> - <para>On &os; 7.X use the following command + <para>On &os; 7.<replaceable>X</replaceable> use the following command instead:</para> <screen>&prompt.root; <userinput>cu -l /dev/cuad0</userinput></screen> @@ -4553,8 +4553,7 @@ off USB drives. It also supports booting into a <quote>livefs</quote> based rescue mode. The documentation packages are provided but no other - packages. This image is not available for &os; 7.3 - and earlier.</entry> + packages. This image is not available for &os; 7.<replaceable>X</replaceable>.</entry> </row> <row> @@ -4570,7 +4569,7 @@ <entry>A CD image with as many third-party packages as would fit on the disc. This image is not - available for &os; 8.0 and later.</entry> + available for &os; 8.<replaceable>X</replaceable>.</entry> </row> <row> @@ -4578,7 +4577,7 @@ <entry>Another CD image with as many third-party packages as would fit on the disc. This image is - not available for &os; 8.0 and later.</entry> + not available for &os; 8.<replaceable>X</replaceable>.</entry> </row> <row> @@ -4599,8 +4598,8 @@ </table> <note> - <para>&os; 7.X releases before &os; 7.3 and - &os; 8.X releases before &os; 8.1 used a + <para>&os; 7.<replaceable>X</replaceable> releases before &os; 7.3 and + &os; 8.0 used a different naming convention. The names of their ISO images are not prefixed with <literal>&os;-</literal>.</para> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#103 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1099 2011/03/06 22:39:45 pav Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1100 2011/03/29 08:04:35 bcr Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -8556,6 +8556,89 @@ <programlisting>USE_XFCE= mcsmanager configenv</programlisting> </sect1> + <sect1 id="using-mozilla"> + <title>Using Mozilla</title> + + <table frame="none"> + <title>Variables for ports that use Mozilla</title> + + <tgroup cols="2"> + <tbody> + + <row> + <entry><makevar>USE_GECKO</makevar></entry> + + <entry>Gecko backend the port can handle. Possible values: + <literal>libxul</literal> (<filename>libxul.so</filename>), + <literal>seamonkey</literal> (<filename>libgtkembedmoz.so</filename>, + deprecated, shouldn't be used anymore).</entry> + </row> + <row> + <entry><makevar>USE_FIREFOX</makevar></entry> + + <entry>The port requires Firefox as a runtime dependency. + Possible values: + <literal>yes</literal> (get default version), + <literal>40</literal>, <literal>36</literal>, + <literal>35</literal>. + Default dependency is on version + <literal>40</literal>.</entry> + </row> + <row> + <entry><makevar>USE_FIREFOX_BUILD</makevar></entry> + + <entry>The port requires Firefox as a buildtime dependency. + Possible values: see USE_FIREFOX. + This automatically sets USE_FIREFOX and + assigns the same value.</entry> + </row> + <row> + <entry><makevar>USE_SEAMONKEY</makevar></entry> + + <entry>The port requires SeaMonkey as a runtime dependency. + Possible values: + <literal>yes</literal> (get default version), + <literal>20</literal>, <literal>11</literal> + (deprecated, shouldn't be used anymore). + Default dependency is on version + <literal>20</literal>.</entry> + </row> + <row> + <entry><makevar>USE_SEAMONKEY_BUILD</makevar></entry> + + <entry>The port requires SeaMonkey as a buildtime dependency. + Possible values: see USE_SEAMONKEY. + This automatically sets USE_SEAMONKEY and + assigns the same value.</entry> + </row> + <row> + <entry><makevar>USE_THUNDERBIRD</makevar></entry> + + <entry>The port requires Thunderbird as a runtime dependency. + Possible values: + <literal>yes</literal> (get default version), + <literal>31</literal>, <literal>30</literal> + (deprecated, shouldn't be used anymore). + Default dependency is on version + <literal>31</literal>.</entry> + </row> + <row> + <entry><makevar>USE_THUNDERBIRD_BUILD</makevar></entry> + + <entry>The port requires Thunderbird as a buildtime dependency. + Possible values: see USE_THUNDERBIRD. + This automatically sets USE_THUNDERBIRD + and assigns the same value.</entry> + </row> + + </tbody> + </tgroup> + </table> + <para>A complete list of available variables can be found in + <filename>/usr/ports/Mk/bsd.gecko.mk</filename>.</para> + </sect1> + + <sect1 id="using-databases"> <title>Using databases</title> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#55 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.536 2011/03/17 20:13:23 sbz Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.537 2011/04/02 00:01:54 art Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -88,6 +88,8 @@ <!ENTITY a.arr "Andrew R. Reiter <email>arr@FreeBSD.org</email>"> +<!ENTITY a.art "Artem Belevich <email>art@FreeBSD.org</email>"> + <!ENTITY a.arun "Arun Sharma <email>arun@FreeBSD.org</email>"> <!ENTITY a.arved "Tilman Keskinöz <email>arved@FreeBSD.org</email>"> ==== //depot/projects/docproj_nl/share/pgpkeys/avg.key#2 (text+ko) ==== @@ -1,10 +1,11 @@ -<!-- $FreeBSD: doc/share/pgpkeys/avg.key,v 1.1 2009/02/18 13:04:08 avg Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/avg.key,v 1.2 2011/03/31 15:58:32 avg Exp $ --> <!-- sh addkey.sh avg A651FE2F; --> <programlisting role="pgpfingerprint"><![CDATA[ pub 2048R/A651FE2F 2009-02-16 Key fingerprint = F234 4D58 DEFF 5E3A 4E0F 13BC 74A5 2D27 A651 FE2F +uid Andriy Gapon (FreeBSD) <avg@FreeBSD.org> uid Andriy Gapon (FreeBSD) <avg@freebsd.org> uid Andriy Gapon (FreeBSD) <avg@icyb.net.ua> sub 4096R/F9A4D312 2009-02-16 @@ -18,46 +19,54 @@ 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 -maATzhsOLAzTARzC9+OmDsItyFnveYUKQQEUwg== -=4PiO +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 +wg== +=/KPo -----END PGP PUBLIC KEY BLOCK----- ]]></programlisting> ==== //depot/projects/docproj_nl/share/pgpkeys/ed.key#2 (text+ko) ==== @@ -1,512 +1,77 @@ -<!-- $FreeBSD: doc/share/pgpkeys/ed.key,v 1.1 2008/05/22 13:16:39 ed Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/ed.key,v 1.2 2011/03/30 09:33:55 ed Exp $ --> <!-- -sh addkey.sh ed 0D9E0B05; +sh addkey.sh ed 3491A2BB; --> <programlisting role="pgpfingerprint"><![CDATA[ -pub 1024D/0D9E0B05 2006-03-21 [expires: 2011-03-20] - Key fingerprint = 9476 D3D6 52BD F249 08A0 ACD5 E764 8318 0D9E 0B05 -uid Ed Schouten (FreeBSD) <ed@FreeBSD.org> -uid Ed Schouten <ed@fxq.nl> -uid Ed Schouten (Fontys Hogescholen Eindhoven) <e.schouten@student.fontys.nl> -uid Ed Schouten (Dispuut Interlink) <ed@il.fontys.nl> +pub 4096R/3491A2BB 2011-03-12 [expires: 2016-03-10] + Key fingerprint = A110 5982 A887 74A2 F4B1 D70A 6E5E D8FE 3491 A2BB +uid Ed Schouten (The FreeBSD Project) <ed@FreeBSD.org> uid Ed Schouten <ed@80386.nl> -sub 4096g/80043EEA 2006-03-21 [expires: 2011-03-20] +sub 4096R/81BB41E6 2011-03-12 [expires: 2016-03-10] ]]></programlisting> <programlisting role="pgpkey"><