PERFORCE change 169381 for review
Rene Ladan
rene at FreeBSD.org
Sun Oct 11 09:33:46 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=169381
Change 169381 by rene at rene_self on 2009/10/11 09:33:25
IFC
Affected files ...
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#30 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#23 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#25 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#29 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/jh.key#1 branch
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#27 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#24 integrate
.. //depot/projects/docproj_nl/www/en/administration.sgml#8 integrate
.. //depot/projects/docproj_nl/www/en/developers.sgml#23 integrate
.. //depot/projects/docproj_nl/www/en/news/status/Makefile#6 integrate
.. //depot/projects/docproj_nl/www/en/news/status/report-2009-04-2009-09.xml#1 branch
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#52 integrate
Differences ...
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#34 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.876 2009/09/17 13:25:51 glarkin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.877 2009/10/07 19:56:20 glarkin Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3400,6 +3400,11 @@
</listitem>
<listitem>
+ <para>Grzegorz Blach
+ <email>magik at roorback.net</email></para>
+ </listitem>
+
+ <listitem>
<para>Guido Falsi
<email>mad at madpilot.net</email></para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#30 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.273 2009/09/16 15:02:14 wen Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.274 2009/10/04 14:47:10 jh Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -511,6 +511,10 @@
</listitem>
<listitem>
+ <para>&a.jh;</para>
+ </listitem>
+
+ <listitem>
<para>&a.ghelmer;</para>
</listitem>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#23 (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.1116 2009/06/08 19:43:01 bcr Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1117 2009/10/04 05:42:00 manolis Exp $</pubdate>
<copyright>
<year>1995</year>
@@ -275,10 +275,9 @@
<answer>
<para>James Howard wrote a good explanation of the history and
- differences between the various projects for <ulink
- url="http://www.daemonnews.org/">DaemonNews</ulink>,
+ differences between the various projects,
called <ulink
- url="http://ezine.daemonnews.org/200104/bsd_family.html">The BSD Family Tree</ulink>
+ url="http://www-personal.si.umich.edu/~dhogan/documentation/unix/bsd-family.html">The BSD Family Tree</ulink>
which goes a fair way to answering this question.</para>
</answer>
</qandaentry>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1030 2009/09/30 15:06:38 tabthorpe Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1032 2009/10/04 17:56:34 keramida Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5885,11 +5885,21 @@
<para>KDE 4.x ports are installed into <literal>${KDE4_PREFIX}</literal>,
which is <filename>/usr/local/kde4</filename> currently, to avoid conflicts
- with KDE 3.x ports. This is achieved by specifying <literal>kdeprefix</literal>
- component, which overrides default <makevar>PREFIX</makevar>. The ports however
- respect <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment
+ with KDE 3.x ports. This is achieved by specifying the <literal>kdeprefix</literal>
+ component, which overrides the default <makevar>PREFIX</makevar>. The ports however
+ respect any <makevar>PREFIX</makevar> set via <envar>MAKEFLAGS</envar> environment
variable and/or <application>make</application> arguments.</para>
+ <para>KDE 4.x ports may conflict with KDE 3.x ports, so when the
+ <literal>kdeprefix</literal> component is enabled, they are installed in
+ <literal>${KDE4_PREFIX}</literal>. The default value of
+ <literal>KDE4_PREFIX</literal> is currently
+ <filename>/usr/local/kde4</filename>. Installing the KDE 4.x ports into
+ a custom <literal>PREFIX</literal> is also possible. When
+ <literal>PREFIX</literal> is set via the <envar>MAKEFLAGS</envar>
+ environment variable or via <application>make</application> options it
+ overrides the value configured by <literal>kdeprefix</literal>.</para>
+
<example id="kde4-components-example">
<title><makevar>USE_KDE4</makevar> example</title>
==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#25 (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.489 2009/09/16 14:58:25 wen Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.490 2009/10/04 14:47:10 jh Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">
@@ -500,6 +500,8 @@
<!ENTITY a.jgreco "Joe Greco <email>jgreco at FreeBSD.org</email>">
+<!ENTITY a.jh "Jaakko Heinonen <email>jh at FreeBSD.org</email>">
+
<!ENTITY a.jhay "John Hay <email>jhay at FreeBSD.org</email>">
<!ENTITY a.jhb "John Baldwin <email>jhb at FreeBSD.org</email>">
==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#29 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Dutch Documentation Project
- $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.18 2009/08/26 06:04:09 rene Exp $
+ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/cutting-edge/chapter.sgml,v 1.19 2009/10/04 14:06:59 rene Exp $
%SOURCE% en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml
%SRCID% 1.245
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#27 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.109 2009/09/30 22:43:26 csjp Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.110 2009/10/04 14:47:10 jh Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -481,6 +481,11 @@
&pgpkey.niels;
</sect2>
+ <sect2 id="pgpkey-jh">
+ <title>&a.jh;</title>
+ &pgpkey.jh;
+ </sect2>
+
<sect2 id="pgpkey-ghelmer">
<title>&a.ghelmer;</title>
&pgpkey.ghelmer;
==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#24 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.202 2009/09/30 22:43:26 csjp Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.203 2009/10/04 14:47:10 jh Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -127,6 +127,7 @@
<!ENTITY pgpkey.jdp SYSTEM "jdp.key">
<!ENTITY pgpkey.jedgar SYSTEM "jedgar.key">
<!ENTITY pgpkey.jesper SYSTEM "jesper.key">
+<!ENTITY pgpkey.jh SYSTEM "jh.key">
<!ENTITY pgpkey.jhay SYSTEM "jhay.key">
<!ENTITY pgpkey.jhb SYSTEM "jhb.key">
<!ENTITY pgpkey.jilles SYSTEM "jilles.key">
==== //depot/projects/docproj_nl/www/en/administration.sgml#8 (text+ko) ====
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.25 2009/06/04 09:21:29 linimon Exp $">
+<!ENTITY date "$FreeBSD: www/en/administration.sgml,v 1.26 2009/10/06 08:03:43 danger Exp $">
<!ENTITY title "FreeBSD Project Administration and Management">
<!ENTITY % navinclude.about "INCLUDE">
<!ENTITY % developers SYSTEM "developers.sgml"> %developers;
@@ -169,6 +169,7 @@
<li>&a.murray; <<a href="mailto:murray at FreeBSD.org">murray at FreeBSD.org</a>></li>
<li>&a.rwatson; <<a href="mailto:rwatson at FreeBSD.org">rwatson at FreeBSD.org</a>></li>
<li>&a.dwhite; <<a href="mailto:dwhite at FreeBSD.org">dwhite at FreeBSD.org</a>></li>
+ <li>&a.bz; <<a href="mailto:bz at FreeBSD.org">bz at FreeBSD.org</a>></li>
</ul>
<h3><a name="t-re-alpha">FreeBSD/alpha Release Engineering Team</a>
==== //depot/projects/docproj_nl/www/en/developers.sgml#23 (text+ko) ====
@@ -6,7 +6,7 @@
us to update author names, or the representation of those names (such
as adding email addresses), by just editing a single file.
-$FreeBSD: www/en/developers.sgml,v 1.230 2009/09/16 15:05:12 wen Exp $
+$FreeBSD: www/en/developers.sgml,v 1.231 2009/10/04 15:00:07 jh Exp $
-->
@@ -248,6 +248,7 @@
<!ENTITY a.jfitz "James FitzGibbon">
<!ENTITY a.jfv "Jack F. Vogel">
<!ENTITY a.jgreco "Joe Greco">
+<!ENTITY a.jh "Jaakko Heinonen">
<!ENTITY a.jhay "John Hay">
<!ENTITY a.jhb "John Baldwin">
<!ENTITY a.jhs "Julian Stacey">
==== //depot/projects/docproj_nl/www/en/news/status/Makefile#6 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/news/status/Makefile,v 1.46 2009/05/07 18:12:15 brd Exp $
+# $FreeBSD: www/en/news/status/Makefile,v 1.47 2009/10/05 12:49:16 danger Exp $
.if exists(../Makefile.conf)
.include "../Makefile.conf"
@@ -44,6 +44,7 @@
XMLDOCS+= report-2008-07-2008-09
XMLDOCS+= report-2008-10-2008-12
XMLDOCS+= report-2009-01-2009-03
+#XMLDOCS+= report-2009-04-2009-09
XSLT.DEFAULT= report.xsl
==== //depot/projects/docproj_nl/www/share/sgml/news.xml#52 (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.271 2009/09/21 20:05:13 blackend Exp $
+ $FreeBSD: www/share/sgml/news.xml,v 1.272 2009/10/04 15:00:07 jh Exp $
</cvs:keyword>
</cvs:keywords>
@@ -33,6 +33,18 @@
<name>2009</name>
<month>
+ <name>10</name>
+ <day>
+ <name>4</name>
+
+ <event>
+ <p>New committer: <a href="mailto:jh at FreeBSD.org">Jaakko
+ Heinonen</a> (src)</p>
+ </event>
+ </day>
+ </month>
+
+ <month>
<name>9</name>
<day>
More information about the p4-projects
mailing list