PERFORCE change 153443 for review

Rene Ladan rene at FreeBSD.org
Mon Nov 24 09:33:53 PST 2008


http://perforce.freebsd.org/chv.cgi?CH=153443

Change 153443 by rene at rene_self on 2008/11/24 17:33:02

	IFC (resolve some local conflicts)

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#13 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#12 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#12 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 integrate
.. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/share/misc/docbook.css#3 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#10 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#10 integrate
.. //depot/projects/docproj_nl/share/pgpkeys/pho.key#1 branch
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#5 integrate
.. //depot/projects/docproj_nl/share/sgml/man-refs.ent#8 integrate
.. //depot/projects/docproj_nl/www/en/docproj/translations.sgml#3 integrate
.. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#7 integrate
.. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#2 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#18 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#6 (text+ko) ====

@@ -13,7 +13,7 @@
       </author>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.278 2008/08/16 21:42:35 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.279 2008/11/22 13:02:43 pgj Exp $</pubdate>
 
     <copyright>
       <year>1999</year>
@@ -2020,7 +2020,8 @@
 	    someone who manages an overall category of FreeBSD
 	    evolution, such as internationalization or networking.
 	    See <ulink
-	    url="&url.base;/administration.html"></ulink>
+	      url="&url.base;/administration.html">
+	      http://www.FreeBSD.org/administration.html</ulink>
 	    for more information on this.</para>
 	</listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#13 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.247 2008/11/04 21:05:47 rene Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.249 2008/11/20 11:15:54 koitsu Exp $ -->
 <!--
 	NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
 	alphabetical order by last name. Please keep in mind that fact while
@@ -195,10 +195,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.koitsu;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.perky;</para>
     </listitem>
 
@@ -503,6 +499,10 @@
     </listitem>
 
     <listitem>
+      <para>&a.pho;</para>
+    </listitem>
+
+    <listitem>
       <para>&a.horikawa;</para>
     </listitem>
 

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#4 (text+ko) ====

@@ -1,7 +1,11 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.54 2008/08/16 22:21:38 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml,v 1.56 2008/11/24 06:41:56 pgj Exp $ -->
 
   <itemizedlist>
     <listitem>
+      <para>&a.koitsu; (2006 - 2008)</para>
+    </listitem>
+
+    <listitem>
       <para>&a.trevor; (2000 - 2007)</para>
     </listitem>
 
@@ -347,9 +351,11 @@
       <para>&a.mtaylor; (1999 - 2003)</para>
     </listitem>
 
+    <!-- Reactivated in 2008
     <listitem>
       <para>&a.pho; (1999 - 2003)</para>
     </listitem>
+    -->
 
     <listitem>
       <para>&a.dufault; (1995 - 2003)</para>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml,v 1.18 2006/01/05 20:03:34 delphij Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml,v 1.20 2008/11/18 07:32:15 pgj Exp $
 -->
 
 <chapter id="introduction">
@@ -92,7 +92,7 @@
       <filename class="directory">/usr/src</filename></title>
 
     <para>The complete source code to FreeBSD is available from our
-      public CVS repository.  The source code is normally installed in
+      public repository.  The source code is normally installed in
       <filename class="directory">/usr/src</filename> which contains the
       following subdirectories:</para>
 
@@ -114,6 +114,12 @@
 	    </row>
 	    
 	    <row>
+	      <entry><filename class="directory">cddl/</filename></entry>
+	      <entry>Utilities covered by the Common Development and
+		Distribution License</entry>
+	    </row>
+
+	    <row>
 	    <entry><filename class="directory">contrib/</filename></entry>
 	    <entry>Source for files from contributed software.</entry>
 	    </row>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v 1.35 2008/08/31 13:04:12 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml,v 1.36 2008/11/18 07:32:15 pgj Exp $
 -->
 
 <chapter id="policies">
@@ -544,7 +544,7 @@
       <listitem>
         <para>Any encumbered file requires specific approval from the 
 	  <ulink url="&url.base;/administration.html#t-core">Core Team</ulink> before it is added to the
-	  CVS repository.</para>
+	  repository.</para>
       </listitem>
 
       <listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.414 2008/09/18 07:33:23 pav Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.415 2008/11/16 20:53:20 rene Exp $
 -->
 
 <chapter id="advanced-networking">

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.154 2008/09/28 11:56:09 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.155 2008/11/24 16:39:19 rene Exp $
 -->
 
 <chapter id="basics">

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.78 2008/10/25 17:16:32 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.79 2008/11/18 22:59:03 carvay Exp $
 -->
 
 <chapter id="desktop">
@@ -1106,6 +1106,13 @@
 	    <entry><literal>abacus</literal></entry>
 	    <entry><filename role="package">deskutils/abacus</filename></entry>
 	  </row>
+
+	    <row>
+	      <entry><application>KMyMoney</application></entry>
+	      <entry><literal>kmymoney2</literal></entry>
+	      <entry><filename role="package">finance/kmymoney2</filename></entry>
+	      </row>
+
         </tbody>
       </tgroup>
     </informaltable>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 (text+ko) ====

@@ -8,7 +8,7 @@
 
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.5 2008/10/20 12:50:42 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.6 2008/11/20 20:59:51 pgj Exp $
 -->
 
 <chapter id="dtrace">
@@ -22,44 +22,44 @@
     </authorgroup>
   </chapterinfo>
 
-  <title>DTrace</title>
+  <title>&dtrace;</title>
 
   <sect1 id="dtrace-synopsis">
     <title>Synopsis</title>
 
-    <indexterm><primary>DTrace</primary></indexterm>
+    <indexterm><primary>&dtrace;</primary></indexterm>
     <indexterm>
-      <primary>DTrace support</primary>
-      <see>DTrace</see>
+      <primary>&dtrace; support</primary>
+      <see>&dtrace;</see>
     </indexterm>
 
-  <para>DTrace, also known as Dynamic Tracing, was developed by
+  <para>&dtrace;, also known as Dynamic Tracing, was developed by
     &sun; as a tool for locating performance bottlenecks
     in production and pre-production systems.  It is not, in any way,
     a debugging tool, but a tool for real time system analysis to
     locate performance and other issues.</para>
 
-  <para>DTrace is a remarkable profiling tool, with an impressive
+  <para>&dtrace; is a remarkable profiling tool, with an impressive
     array of features for diagnosing system issues.  It may also be
     used to run pre-written scripts to take advantage of its
     capabilities.  Users may even author their own utilities using
-    the DTrace D Language, allowing them to customize their profiling
+    the &dtrace; D Language, allowing them to customize their profiling
     based on specific needs.</para>
 
     <para>After reading this chapter, you will know:</para>
 
     <itemizedlist>
       <listitem>
-	<para>What DTrace is and what features it provides.</para>
+	<para>What &dtrace; is and what features it provides.</para>
       </listitem>
 
       <listitem>
-	<para>Differences between the &solaris; DTrace implementation
+	<para>Differences between the &solaris; &dtrace; implementation
 	  and the one provided by &os;.</para>
       </listitem>
 
       <listitem>
-	<para>How to enable and use DTrace on &os;.</para>
+	<para>How to enable and use &dtrace; on &os;.</para>
       </listitem>
     </itemizedlist>
 
@@ -104,11 +104,11 @@
   <sect1 id="dtrace-implementation">
     <title>Implementation Differences</title>
 
-    <para>While the DTrace in &os; is very similar to that found
+    <para>While the &dtrace; in &os; is very similar to that found
       in &solaris;, differences exist that should be explained before
       continuing.  The primary difference users will notice is that
-      on &os;, DTrace needs to be specifically enabled.  There are
-      kernel options and modules which must be enabled for DTrace to
+      on &os;, &dtrace; needs to be specifically enabled.  There are
+      kernel options and modules which must be enabled for &dtrace; to
       work properly.  These will be explained later.</para>
 
     <para>There is a <literal>DDB_CTF</literal> kernel option which
@@ -132,29 +132,29 @@
       allows tracing <function>malloc()</function> by type in the
       &os; kernel.</para>
 
-    <para>Only <username>root</username> may use DTrace on &os;.
+    <para>Only <username>root</username> may use &dtrace; on &os;.
       This is related to security differences, &solaris; has a few
       low level security checks which do not yet exist in &os;.  As
       such, the <devicename>/dev/dtrace/dtrace</devicename> is strictly
       limited to <username>root</username> users only.</para>
 
-    <para>Finally, the DTrace software falls under &sun;'s
+    <para>Finally, the &dtrace; software falls under &sun;'s
       <acronym>CDDL</acronym> license.  The <literal>Common Development
       and Distribution License</literal> comes with &os;, see the
       <filename>/usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE</filename>
       or view it online at
       <ulink url="http://www.opensolaris.org/os/licensing"></ulink>.</para>
 
-    <para>This license means that a &os; kernel with the DTrace options
+    <para>This license means that a &os; kernel with the &dtrace; options
       is still <acronym>BSD</acronym> licensed; however the
       <acronym>CDDL</acronym> kicks in when the modules are distributed
       in binary form, or the binaries are loaded.</para>
   </sect1>
 
   <sect1 id="dtrace-enable">
-    <title>Enabling DTrace Support</title>
+    <title>Enabling &dtrace; Support</title>
 
-    <para>To enable support for DTrace, add the following lines to
+    <para>To enable support for &dtrace;, add the following lines to
       the kernel configuration file:</para>
 
     <programlisting>options         KDTRACE_HOOKS
@@ -167,7 +167,7 @@
       <programlisting>options         KDTRACE_FRAME</programlisting>
 
       <para>This option provides support for the <acronym>FBT</acronym>
-	feature.  DTrace will work without this option; however, there
+	feature.  &dtrace; will work without this option; however, there
 	will be limited support for function boundary tracing.</para>
       </note>
 
@@ -190,14 +190,14 @@
 
     <para>After rebooting and allowing the new kernel to be loaded
       into memory, support for the Korn shell should be added.  This
-      is needed as the DTrace toolkit has several utilities written
+      is needed as the &dtrace; toolkit has several utilities written
       in <command>ksh</command>.  Install the
       <filename role="package">shells/ksh93</filename>.  It is also
       possible to run these tools under
       <filename role="package">shells/pdksh</filename> or
       <filename role="package">shells/mksh</filename>.</para>
 
-    <para>Finally, obtain the current DTrace toolkit.  The current
+    <para>Finally, obtain the current &dtrace; toolkit.  The current
       version is available at
       <ulink url="http://www.opensolaris.org/os/community/dtrace/dtracetoolkit/"></ulink>.
       There is an install mechanism included; however, installation
@@ -205,26 +205,26 @@
   </sect1>
 
   <sect1 id="dtrace-using">
-    <title>Using DTrace</title>
+    <title>Using &dtrace;</title>
 
-    <para>Before making use of DTrace functionality, the DTrace device
+    <para>Before making use of &dtrace; functionality, the &dtrace; device
       must exist.  To load the device, issue the following
       command:</para>
 
     <screen>&prompt.root; <userinput>kldload dtraceall</userinput></screen>
 
-    <para>DTrace support should now be available.  To view all probes
+    <para>&dtrace; support should now be available.  To view all probes
       the administrator may now execute the following command:</para>
 
     <screen>&prompt.root; <userinput>dtrace -l | more</userinput></screen>
 
     <para>All output is passed to the <command>more</command>
       utility as it will quickly overflow the screen buffer.  At
-      this point, DTrace should be considered working.  It is now
+      this point, &dtrace; should be considered working.  It is now
       time to review the toolkit.</para>
 
     <para>The toolkit is a collection of ready-made scripts to run
-      with DTrace to collect system information.  There are scripts
+      with &dtrace; to collect system information.  There are scripts
       to check open files, memory, <acronym>CPU</acronym> usage and
       a lot more.  Extract the scripts with the following
       command:</para>
@@ -247,14 +247,14 @@
 
     <important>
       <para>At this point it is prudent to remind the reader that
-	DTrace support in &os; is <emphasis>incomplete</emphasis>
+	&dtrace; support in &os; is <emphasis>incomplete</emphasis>
 	and <emphasis>experimental</emphasis>.  Many of these scripts
 	will not work as they are either too &solaris;-specific or
 	use probes which are unsupported at this time.</para>
     </important>
 
     <para>At the time of this writing only two of the scripts of the
-      DTrace Toolkit are fully supported in &os;:
+      &dtrace; Toolkit are fully supported in &os;:
       the <filename>hotkernel</filename>
       and <filename>procsystime</filename> scripts.  These are the two
       we will explore in the following parts of this section.</para>
@@ -371,8 +371,8 @@
   <sect1 id="dtrace-language">
     <title>The D Language</title>
 
-    <para>The DTrace Toolkit includes many scripts in the special language of
-      DTrace.  This language is called <quote>the D language</quote> by &sun;
+    <para>The &dtrace; Toolkit includes many scripts in the special language of
+      &dtrace;.  This language is called <quote>the D language</quote> by &sun;
       documentation, and it is very similar to C++.  An in depth
       discussion of the language is beyond the scope of this document.  It is
       extensively discussed

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#6 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.73 2008/08/21 21:29:21 danger Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.74 2008/11/24 16:37:58 rene Exp $
 -->
 
 <chapter id="mac">
@@ -2029,8 +2029,7 @@
 
       <para>When I attempt to switch from the <username>root</username> user
 	to another user in the system, the error message
-	<errorname>_secure_path: unable to state .login_conf</errorname>
-	appears.</para>
+	<errorname>_secure_path: unable to state .login_conf</errorname> appears.</para>
 
       <para>This message is usually shown when the user has a higher
 	label setting then that of the user whom they are attempting to

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.41 2008/11/12 22:20:36 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml,v 1.43 2008/11/20 20:59:51 pgj Exp $
 -->
 
 <preface id="book-preface">
@@ -428,9 +428,9 @@
       </listitem>
     </varlistentry>
     <varlistentry>
-      <term><emphasis><xref linkend="dtrace">, Dtrace</emphasis></term>
+      <term><emphasis><xref linkend="dtrace">, &dtrace;</emphasis></term>
       <listitem>
-	<para>Describes how to configure and use the DTrace tool from &sun;
+	<para>Describes how to configure and use the &dtrace; tool from &sun;
 	  in &os;.  Dynamic tracing can help locate performance issues, by
 	  performing real time system analysis.</para>
       </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#3 (text+ko) ====

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/updating/chapter.sgml,v 1.1 2008/09/28 12:00:39 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/updating/chapter.sgml,v 1.2 2008/11/24 16:30:08 rene Exp $
 -->
 
 <chapter id="updating">

==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#12 (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.465 2008/11/04 20:03:28 rene Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.467 2008/11/24 06:38:24 pgj Exp $
 -->
 
 <!ENTITY a.aaron "Aaron Dalton <email>aaron at FreeBSD.org</email>">

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.13 2008/11/10 20:34:00 rene Exp $
+# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.14 2008/11/16 20:50:17 rene Exp $
 # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $
 #
 # %SOURCE%	en_US.ISO8859-1/books/handbook/Makefile

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.5 2008/10/18 14:24:46 remko Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.6 2008/11/16 21:23:42 rene Exp $
 
      %SOURCE%  en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
      %SRCID%   1.415

==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Dutch Documentation Project
 
-     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.16 2008/11/10 20:42:03 rene Exp $
+     $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.17 2008/11/16 20:46:32 rene Exp $
 
      %SOURCE%	en_US.ISO8859-1/books/handbook/config/chapter.sgml
      %SRCID%	1.236

==== //depot/projects/docproj_nl/share/misc/docbook.css#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: doc/share/misc/docbook.css,v 1.13 2008/11/09 04:24:47 chinsan Exp $
+ * $FreeBSD: doc/share/misc/docbook.css,v 1.14 2008/11/21 07:28:34 keramida Exp $
  */
 
 BODY ADDRESS {
@@ -149,61 +149,55 @@
 	text-decoration: underline;
 } 
 
-.PROGRAMLISTING, .SCREEN {
-	background-color: #DEE3E7;
-	padding: 4px;
+.SCREEN {
+	padding: 1ex;
+}
+
+.PROGRAMLISTING {
+	padding: 1ex;
+	background-color: #eee;
+	border: 1px solid #ccc;
 }
 
 @media screen {  /* hide from IE3 */
 	a[href]:hover { background: #ffa }
 }
 
-
-BLOCKQUOTE.NOTE{
-	color: #173B7F;
-	background: #d5e3ff;
-	border: 2px solid #7387b0;
-	padding-top: 1px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-bottom: 2px;
-	width: 800px;
+BLOCKQUOTE.NOTE {
+	color: #222;
+	background: #eee;
+	border: 1px solid #ccc;
+	padding: 0.4em 0.4em;
+	width: 85%;
 }
 
-BLOCKQUOTE.TIP{
+BLOCKQUOTE.TIP {
 	color: #004F00;
-	background: #c8dcc6;
-	border: 2px solid green;
-	padding: 3px;
-	width: 800px;
-	align: middle;
+	background: #d8ecd6;
+	border: 1px solid green;
+	padding: 0.2em 2em;
+	width: 85%;
 }
 
-BLOCKQUOTE.IMPORTANT{
-	color:red;
-	font-family: arial; 
+BLOCKQUOTE.IMPORTANT {
 	font-style:italic;
-	font-weight:bold;
-	line-height: 21px;
+	border: 1px solid #a00;
+	border-left: 12px solid #c00;
+	padding: 0.1em 1em;
 }
 
-BLOCKQUOTE.WARNING{
+BLOCKQUOTE.WARNING {
 	color: #9F1313;
-	background: #f8e4e4;
-	border: 2px solid #e59595;
-	padding-top: 1px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-bottom: 2px;
-	width: 800px;	
+	background: #f8e8e8;
+	border: 1px solid #e59595;
+	padding: 0.2em 2em;
+	width: 85%;
 }
 
-.EXAMPLE{
+.EXAMPLE {
 	background: #fefde6;
-	border: 2px solid #f1bb16;
-	padding-top: 1px;
-	padding-left: 5px;
-	padding-right: 5px;
-	padding-bottom: 2px;
-	width: 800px;
+	border: 1px solid #f1bb16;
+	margin: 1em 0;
+	padding: 0.2em 2em;
+	width: 90%;
 }

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#10 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.82 2008/11/04 20:58:25 rene Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.84 2008/11/20 11:53:43 pgj Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -174,10 +174,12 @@
       &pgpkey.gahr;
     </sect2>
 
+<!--
     <sect2 id="pgpkey-koitsu">
       <title>&a.koitsu;</title>
       &pgpkey.koitsu;
     </sect2>
+-->
 
     <sect2 id="pgpkey-perky">
       <title>&a.perky;</title>
@@ -454,6 +456,11 @@
       &pgpkey.mux;
     </sect2>
 
+    <sect2 id="pgpkey-pho">
+      <title>&a.pho;</title>
+      &pgpkey.pho;
+    </sect2>
+
     <sect2 id="pgpkey-mich">
       <title>&a.mich;</title>
       &pgpkey.mich;

==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#10 (text+ko) ====

@@ -1,5 +1,5 @@
 
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.179 2008/11/04 20:59:03 rene Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.180 2008/11/18 17:34:30 hrs Exp $ -->
 <!-- PGP keyblocks -->
 <!ENTITY pgpkey.aaron SYSTEM "aaron.key">
 <!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -222,6 +222,7 @@
 <!ENTITY pgpkey.phantom SYSTEM "phantom.key">
 <!ENTITY pgpkey.philip SYSTEM "philip.key">
 <!ENTITY pgpkey.phk SYSTEM "phk.key">
+<!ENTITY pgpkey.pho SYSTEM "pho.key">
 <!ENTITY pgpkey.pirzyk SYSTEM "pirzyk.key">
 <!ENTITY pgpkey.pjd SYSTEM "pjd.key">
 <!ENTITY pgpkey.portmgr-secretary SYSTEM "portmgr-secretary.key">

==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#5 (text+ko) ====

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.105 2008/11/03 19:21:44 blackend Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.106 2008/11/20 20:59:51 pgj 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
@@ -50,6 +50,11 @@
 <!ENTITY xorg "Xorg">
 <!ENTITY xorg.version "7.3">
 
+<!-- Use an entity for DTrace to avoid spelling
+     mistakes stem from unusual capitalization -->
+
+<!ENTITY dtrace "DTrace">
+
 <!-- The currently released version of FreeBSD.  This value is used to
      create some links on web sites and such, so do NOT change it until
      it's really release time -->

==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#8 (text+ko) ====

@@ -20,7 +20,7 @@
      lexicographical order by the entity (i.e., the dots used in place of
      special characters should not be expanded when comparing).
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.472 2008/10/06 21:49:01 simon Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.473 2008/11/24 01:25:26 delphij Exp $
 -->
 
 <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -3257,6 +3257,7 @@
 <!ENTITY man.ahd.4 "<citerefentry/<refentrytitle/ahd/<manvolnum/4//">
 <!ENTITY man.aic.4 "<citerefentry/<refentrytitle/aic/<manvolnum/4//">
 <!ENTITY man.aio.4 "<citerefentry/<refentrytitle/aio/<manvolnum/4//">
+<!ENTITY man.ale.4 "<citerefentry/<refentrytitle/ale/<manvolnum/4//">
 <!ENTITY man.alpm.4 "<citerefentry/<refentrytitle/alpm/<manvolnum/4//">
 <!ENTITY man.als4000.4 "<citerefentry/<refentrytitle/als4000/<manvolnum/4//">
 <!ENTITY man.altq.4 "<citerefentry/<refentrytitle/altq/<manvolnum/4//">

==== //depot/projects/docproj_nl/www/en/docproj/translations.sgml#3 (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/docproj/translations.sgml,v 1.105 2008/10/16 04:55:28 pgj Exp $">
+<!ENTITY date "$FreeBSD: www/en/docproj/translations.sgml,v 1.106 2008/11/16 18:16:55 jkois Exp $">
 <!ENTITY title "FreeBSD Documentation Project: Translations">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -209,15 +209,15 @@
 <dl>
 <dt><i>Documents available</i></dt>
   <dd>
+    <a href="../de/index.html">Web</a>,
     <a href="../doc/de_DE.ISO8859-1/books/faq/index.html">FAQ</a>,
     <a href="../doc/de_DE.ISO8859-1/books/fdp-primer/index.html">FDP Primer</a>,
+    <a href="../doc/de_DE.ISO8859-1/books/handbook/index.html">Handbook</a>,
     <a href="../doc/de_DE.ISO8859-1/books/porters-handbook/index.html">porters-handbook</a>,
     <a href="../doc/de_DE.ISO8859-1/articles/">some articles</a>.
   </dd>
 <dt><i>Documents currently being worked on</i></dt>
   <dd>
-    <a href="../doc/de_DE.ISO8859-1/books/handbook/index.html">Handbook</a>,
-    <a href="../de/index.html">Web</a>,
     <a href="https://doc.bsdgroup.de/doc/de_DE.ISO8859-1/books/developers-handbook/index.html">developers-handbook</a>,
     <a href="https://doc.bsdgroup.de/doc/de_DE.ISO8859-1/books/arch-handbook/index.html">arch-handbook</a>.
   </dd>

==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#6 (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/donations/wantlist.sgml,v 1.470 2008/10/21 12:18:49 brueffer Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.471 2008/11/20 22:08:52 brueffer Exp $">
 <!ENTITY title "FreeBSD Developers Want List">
 <!ENTITY email 'donations'>
 <!ENTITY % navinclude.about "INCLUDE">
@@ -51,14 +51,6 @@
       </tr>
 
       <tr>
-        <td>brueffer</td>
-	<td>Germany</td>
-	<td>IBM 14.1" SGXA+ notebook display</td>
-	<td>Replacement for the faulty display on my notebook
-	  (IBM Thinkpad T41p).</td>
-      </tr>
-
-      <tr>
 	<td>cognet</td>
 	<td>France</td>
 	<td>A Zaurus, with hard disk preferably.</td>

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#7 (text+ko) ====

@@ -10,7 +10,7 @@
 <events>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/events.xml,v 1.58 2008/10/21 12:41:23 rwatson Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.60 2008/11/24 11:19:12 remko Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -33,11 +33,87 @@
       <site>Universe of Cambridge</site>
     </location>
 
-    <description>The ninth annual European BSD Confernece will take place
+    <description>The ninth annual European BSD Conference will take place
       in Cambridge, England in September, 2009, and include a technical
       track, tutorials, and FreeBSD developer summit.</description>
   </event>
 
+  <event id="bsdcan-2009">
+    <name>BSDCan 2009</name>
+    <url>http://www.bsdcan.org/2009/</url>
+    <startdate>
+      <year>2009</year>
+      <month>5</month>
+      <day>14</day>
+    </startdate>
+    <enddate>
+      <year>2009</year>
+      <month>5</month>
+      <day>15</day>
+    </enddate>
+    <location>
+      <country code="CA">Canada</country>
+      <city>Ottawa</city>
+      <site>University of Ottawa</site>
+    </location>
+    <description>BSDCan is a developers conference with a strong focus
+      on emerging technologies, research projects, and works in
+      progress. It also features Userland infrastructure projects and
+      invites contributions from both free software developers and those
+      from commercial vendors.</description>
+  </event>
+
+  <event id="dcbsdcon-2009">
+    <name>DCBSDCon 2009</name>
+    <url>http://www.dcbsdcon.org/</url>
+    <startdate>
+      <year>2009</year>
+      <month>2</month>
+      <day>4</day>
+    </startdate>
+    <enddate>
+      <year>2009</year>
+      <month>2</month>
+      <day>5</day>
+    </enddate>
+    <location>
+      <country code="US">USA</country>
+      <city>Washington, D.C.</city>
+      <site>Marriott Wardman</site>
+    </location>
+
+    <description>The first large BSD Conference in the DC area.  Will
+      include 45 minute presentations on BSD related topics and
+      security themes.</description>
+  </event>
+
+  <event id="nllgg-2008">
+    <name>NLLG-bijeenkomst december 2008</name>
+    <url>http://www.nllgg.nl/bijeenkomst_20081213</url>
+    <startdate>
+      <year>2008</year>
+      <month>12</month>
+      <day>13</day>
+    </startdate>
+    <enddate>
+      <year>2008</year>
+      <month>12</month>
+      <day>13</day>
+    </enddate>
+    <location>
+      <country code="NL">the Netherlands</country>
+      <state>Utrecht</state>
+      <city>Utrecht</city>
+      <site>Liefland college</site>
+    </location>
+
+    <description>The "Nederlandse Linux Gebruikers Groep" (NLLGG)
+      organisation is arranging a national community day in Utrecht
+      focussing on BSD.  Robert Watson, Hans vd Looy, Marten Vijn,
+      Wim Vandeputte and Remko Lodder will do presentations for the
+      Linux community.</description>
+  </event>
+
   <event id="meetbsd-2008">
     <name>MeetBSD California 2008</name>
     <url>http://meetbsd.com/</url>

==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.21 2008/06/23 07:50:03 murray Exp $ -->
+<!-- $FreeBSD: www/share/sgml/navibar.ent,v 1.23 2008/11/24 11:22:27 miwi Exp $ -->
 
 <!ENTITY % navinclude.about "IGNORE">
 <![ %navinclude.about; [
@@ -17,6 +17,7 @@
     <li><a href="&base;/news/newsflash.html">News</a></li>
     <li><a href="&base;/events/events.html">Events</a></li>
     <li><a href="&base;/news/press.html">Press</a></li>
+    <li><a href="&base;/multimedia/multimedia.html">Multimedia</a></li>
     <li><a href="&base;/art.html">Artwork</a></li>
     <li><a href="&base;/logo.html">Logo</a></li>
     <li><a href="&base;/donations/">Donations</a></li>
@@ -34,6 +35,7 @@
   <ul>
     <li><a href="&base;/community.html">Community</a></li>
     <li><a href="&base;/community/mailinglists.html">Mailing Lists</a></li>
+    <li><a href="http://forums.freebsd.org/">Forums</a></li>
     <li><a href="&base;/community/irc.html">IRC</a></li>
     <li><a href="&base;/community/newsgroups.html">Newsgroups</a></li>
     <li><a href="&base;/usergroups.html">User Groups</a></li>

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#18 (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.207 2008/11/11 03:52:54 brd Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.210 2008/11/18 16:51:58 pho Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -36,6 +36,32 @@
       <name>11</name>
 
       <day>
+        <name>18</name>
+
+         <event>
+           <p>Commit bit restored: <a href="mailto:pho at FreeBSD.org">Peter
+              Holm</a> (src)</p>
+         </event>
+      </day>
+
+      <day>
+	<name>16</name>
+
+	<event>
+	  <title>Official FreeBSD Forums Launched</title>
+
+	  <p>The FreeBSD project is finally, after much work, pleased to
+	  announce the availability of an official FreeBSD web based
+	  discussion forum.  It is our hope that this forum will serve
+	  as a public support channel for FreeBSD users around the world
+	  and as a complement to our fine mailing lists.</p>
+
+	  <p>You can register and start using our new service here: <a
+	      href="http://forums.FreeBSD.org">http://forums.FreeBSD.org</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>10</name>
 
 	<event>


More information about the p4-projects mailing list