Date: Sun, 29 Apr 2012 11:58:24 GMT From: Rene Ladan <rene@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 210350 for review Message-ID: <201204291158.q3TBwOPm031913@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@210350?ac=10 Change 210350 by rene@rene_acer on 2012/04/29 11:57:37 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#138 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#84 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#139 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#76 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#59 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#48 integrate .. //depot/projects/docproj_nl/share/pgpkeys/issyl0.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#76 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#73 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#29 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#51 integrate .. //depot/projects/docproj_nl/www/en/where.sgml#19 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#138 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1084 2012/04/22 09:30:16 netchild Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.1085 2012/04/27 18:42:34 pawel Exp $ --> <!-- NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical order by first name. @@ -9413,6 +9413,11 @@ </listitem> <listitem> + <para>Stefan Rumetshofer + <email>sterum@overrider.at</email></para> + </listitem> + + <listitem> <para>Stefan Schmidt <email>stefan.schmidt@twest.de</email></para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#84 (text+ko) ==== @@ -1,4 +1,4 @@ -<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.360 2012/04/25 01:58:44 eadler Exp $ --> +<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.361 2012/04/27 18:03:04 issyl0 Exp $ --> <!-- NOTE TO NEW COMMITTERS: Core and committers lists are sorted in alphabetical order by last name. Please keep in mind that fact while @@ -827,6 +827,10 @@ </listitem> <listitem> + <para>&a.issyl0;</para> + </listitem> + + <listitem> <para>&a.scottl;</para> </listitem> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.315 2012/03/03 19:34:20 eadler Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.316 2012/04/28 22:19:24 gjb Exp $ --> <chapter id="disks"> @@ -2807,9 +2807,20 @@ perform many tasks like running &man.dump.8;, &man.restore.8;, &man.fdisk.8;, &man.bsdlabel.8;, &man.newfs.8;, &man.mount.8;, and more. Livefs CD image for - &os;/&arch.i386; &rel.current;-RELEASE is available + &os;/&arch.i386; &rel2.current;-RELEASE is available from <ulink - url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-livefs.iso"></ulink>.</para>; + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/ISO-IMAGES/&rel2.current;/&os;-&rel2.current;-RELEASE-&arch.i386;-livefs.iso"></ulink>.</para>; + + <note> + <para>Livefs CD images are not available for + &os; &rel.current;-RELEASE and later. In addition to + the CDROM installation images, flash drive installation + images may be used to recover a system. The + <quote>memstick</quote> image for + &os;/&arch.i386; &rel.current;-RELEASE is available + from <ulink + url="ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/&arch.i386;/&arch.i386;/ISO-IMAGES/&rel.current;/&os;-&rel.current;-RELEASE-&arch.i386;-memstick.img"></ulink>.</para>; + </note> <para>Third, create backup tapes regularly. Any changes that you make after your last backup may be irretrievably lost. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#139 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1182 2012/04/22 03:20:30 glewis Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1184 2012/04/28 12:36:12 ryusuke Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -5600,6 +5600,21 @@ <literal>http://search.cpan.org/dist/Module-Name/</literal>; (including the trailing slash).</para> </note> + <note> + <para>It is recommended to avoid using <literal> + ${SITE_PERL}</literal> as a dependency listing. This is + problematic because it means that + <filename>bsd.perl.mk</filename> must be included + to satisfy the dependency. Additionally, if the module's + files change, it would require changing all + dependent ports.</para> + </note> + + <example id="use-perl-dependency-example"> + <title>PERL Dependency Example</title> + + <programlisting>p5-IO-Tee>=0.64:${PORTSDIR}/devel/p5-IO-Tee</programlisting> + </example> </sect1> <sect1 id="using-x11"> @@ -6853,17 +6868,16 @@ <entry><makevar>USE_APACHE</makevar></entry> <entry>The port requires Apache. Possible values: <literal>yes</literal> (gets any version), - <literal>1.3</literal>, <literal>2.0</literal>, - <literal>2.2</literal>, <literal>2.0+</literal>, - etc. Default dependency is on version - <literal>1.3</literal>.</entry> + <literal>2.0</literal>, <literal>2.2</literal>, + <literal>2.0+</literal>, etc. + Default dependency is on version + <literal>2.2</literal>.</entry> </row> <row> <entry><makevar>WITH_APACHE2</makevar></entry> - <entry>The port requires Apache 2.0. Without this - variable, the port will depend on Apache 1.3. This - variable is deprecated and should not be used + <entry>This variable is deprecated and should + not be used anymore.</entry> </row> @@ -6885,9 +6899,8 @@ (read-only variable). This variable is only available after inclusion of <filename>bsd.port.pre.mk</filename>. Possible - values: <literal>13</literal>, - <literal>20</literal>, - <literal>22</literal>.</entry> + values: <literal>20</literal>, + <literal>22</literal>. </row> <row> ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#76 (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.577 2012/04/22 16:45:13 jlh Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.578 2012/04/27 18:03:05 issyl0 Exp $ --> <!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>"> @@ -532,6 +532,8 @@ <!ENTITY a.issei "Issei Suzuki <email>issei@FreeBSD.org</email>"> +<!ENTITY a.issyl0 "Isabell Long <email>issyl0@FreeBSD.org</email>"> + <!ENTITY a.itetcu "Ion-Mihai Tetcu <email>itetcu@FreeBSD.org</email>"> <!ENTITY a.itojun "Jun-ichiro Itoh <email role='nolink'>itojun@FreeBSD.org</email>"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml#59 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Dutch Documentation Project - $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.38 2012/02/26 17:31:53 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.39 2012/04/25 21:40:57 rene Exp $ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/eresources/chapter.sgml ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent#48 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- Namen van FreeBSD mailinglijsten en gerelateerde software. - $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.34 2012/02/26 17:37:19 rene Exp $ + $FreeBSD: doc/nl_NL.ISO8859-1/share/sgml/mailing-lists.ent,v 1.35 2012/04/25 21:40:57 rene Exp $ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/share/sgml/mailing-lists.ent ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#76 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.179 2012/04/23 09:15:01 jlh Exp $ + $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.180 2012/04/27 18:03:05 issyl0 Exp $ --> <sect2 id="pgpkey-ariff"> @@ -986,6 +986,11 @@ &pgpkey.avl; </sect2> + <sect2 id="pgpkey-issyl0"> + <title>&a.issyl0;</title> + &pgpkey.issyl0; + </sect2> + <sect2 id="pgpkey-scottl"> <title>&a.scottl;</title> &pgpkey.scottl; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#73 (text+ko) ==== @@ -1,5 +1,5 @@ -<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.269 2012/04/23 09:15:01 jlh Exp $ --> +<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.270 2012/04/27 18:03:05 issyl0 Exp $ --> <!-- PGP keyblocks --> <!ENTITY pgpkey.aaron SYSTEM "aaron.key"> <!ENTITY pgpkey.ache SYSTEM "ache.key"> @@ -141,6 +141,7 @@ <!ENTITY pgpkey.hrs SYSTEM "hrs.key"> <!ENTITY pgpkey.ijliao SYSTEM "ijliao.key"> <!ENTITY pgpkey.imp SYSTEM "imp.key"> +<!ENTITY pgpkey.issyl0 SYSTEM "issyl0.key"> <!ENTITY pgpkey.itetcu SYSTEM "itetcu.key"> <!ENTITY pgpkey.ivoras SYSTEM "ivoras.key"> <!ENTITY pgpkey.jacula SYSTEM "jacula.key"> ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#29 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- -*- sgml -*- DocBook Miscellaneous FreeBSD Entities. - $FreeBSD: doc/share/sgml/freebsd.ent,v 1.144 2012/04/18 14:05:43 hrs Exp $ + $FreeBSD: doc/share/sgml/freebsd.ent,v 1.145 2012/04/26 19:20:16 bcr Exp $ This file is now valid XML as well as SGML. Please do not add CDATA attributes or anything else that will prevent this file from being @@ -49,7 +49,7 @@ <!-- Use an entity for the X.Org X server --> <!ENTITY xorg "Xorg"> -<!ENTITY xorg.version "7.5.1"> +<!ENTITY xorg.version "7.5.2"> <!-- Use an entity for DTrace to avoid spelling mistakes stem from unusual capitalization --> ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#51 (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/releng/index.sgml,v 1.301 2012/03/06 19:10:07 bz Exp $"> +<!ENTITY date "$FreeBSD: www/en/releng/index.sgml,v 1.302 2012/04/27 14:04:53 bz Exp $"> <!ENTITY email 're'> <!ENTITY title "Release Engineering Information"> <!ENTITY % navinclude.developers "INCLUDE"> @@ -48,9 +48,9 @@ </tr> <tr> - <td>March 2012</td> - <td>&os; 8.3</td> - <td><a href="&base;/releases/8.3R/schedule.html">Target Schedule</a></td> + <td>2012</td> + <td>&os; 9.1</td> + <td>Schedule under discussion.</td> </tr> </table> @@ -102,8 +102,8 @@ <tr> <td><tt>RELENG_8_3</tt></td> <td>Frozen</td> - <td>&contact.re;</td> - <td>Development branch for upcoming FreeBSD 8.3.</td> + <td>&contact.so;</td> + <td>FreeBSD 8.3 supported errata fix branch.</td> </tr> <tr> @@ -145,7 +145,7 @@ <td><tt>RELENG_7_3</tt></td> <td>Frozen</td> <td>&contact.so;</td> - <td>FreeBSD 7.3 supported errata fix branch.</td> + <td>FreeBSD 7.3 errata fix branch (not officially supported).</td> </tr> <tr> ==== //depot/projects/docproj_nl/www/en/where.sgml#19 (text+ko) ==== @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [ -<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.126 2012/02/20 21:34:47 gjb Exp $"> +<!ENTITY date "$FreeBSD: www/en/where.sgml,v 1.128 2012/04/28 19:46:46 gjb Exp $"> <!ENTITY title "Getting FreeBSD"> <!ENTITY % navinclude.download "INCLUDE"> <!ENTITY url.rel "ftp://ftp.FreeBSD.org/pub/FreeBSD/releases">; @@ -102,10 +102,10 @@ <tr> <td colspan="2">FreeBSD &rel2.current;-RELEASE</td> <td colspan="2"></td> - <td rowspan="7"><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td> - <td rowspan="7"><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td> - <td rowspan="7"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[View]</a></td> - <td rowspan="7"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td> + <td rowspan="5"><a href="&base;/releases/&rel2.current;R/relnotes.html">[View]</a></td> + <td rowspan="5"><a href="&base;/releases/&rel2.current;R/hardware.html">[View]</a></td> + <td rowspan="5"><a href="&base;/doc/en_US.ISO8859-1/books/handbook/install.html">[View]</a></td> + <td rowspan="5"><a href="&base;/releases/&rel2.current;R/errata.html">[View]</a></td> </tr> <tr> <td></td> @@ -121,24 +121,12 @@ </tr> <tr> <td></td> - <td>ia64</td> - <td><a href="&url.rel;/ia64/&rel2.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/ia64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> - </tr> - <tr> - <td></td> <td>pc98</td> <td><a href="&url.rel;/pc98/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> </tr> <tr> <td></td> - <td>powerpc</td> - <td><a href="&url.rel;/powerpc/&rel2.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/powerpc/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> - </tr> - <tr> - <td></td> <td>sparc64</td> <td><a href="&url.rel;/sparc64/&rel2.current;-RELEASE">[Distribution]</a></td> <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel2.current;/">[ISO]</a></td> @@ -154,26 +142,26 @@ <tr> <td></td> <td>amd64</td> - <td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> + <!--<td><a href="&url.rel;/amd64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td colspan="2" align="right"><a href="&url.rel;/amd64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>i386</td> - <td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> + <!--<td><a href="&url.rel;/i386/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td colspan="2" align="right"><a href="&url.rel;/i386/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>pc98</td> - <td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> + <!--<td><a href="&url.rel;/pc98/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td colspan="2" align="right"><a href="&url.rel;/pc98/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> <tr> <td></td> <td>sparc64</td> - <td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td> - <td><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> + <!--<td><a href="&url.rel;/sparc64/&rel3.current;-RELEASE">[Distribution]</a></td>--> + <td colspan="2" align="right"><a href="&url.rel;/sparc64/ISO-IMAGES/&rel3.current;/">[ISO]</a></td> </tr> </tbody> </table>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204291158.q3TBwOPm031913>