Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Aug 2010 16:14:13 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 182399 for review
Message-ID:  <201008141614.o7EGED70032979@skunkworks.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@182399?ac=10

Change 182399 by rene@rene_acer on 2010/08/14 16:13:33

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#67 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#5 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#29 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#6 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#10 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#12 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#8 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#85 integrate
.. //depot/projects/docproj_nl/share/sgml/freebsd.ent#18 integrate
.. //depot/projects/docproj_nl/www/en/cgi/man.cgi#17 integrate
.. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#20 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#4 integrate
.. //depot/projects/docproj_nl/www/en/search/opensearch/man-freebsd-release-ports.xml#1 branch
.. //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#25 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#6 integrate
.. //depot/projects/docproj_nl/www/share/sgml/events.xml#30 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#87 integrate

Differences ...

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.936 2010/08/02 13:20:55 bapt Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.939 2010/08/13 08:47:40 bapt Exp $ -->
 <!--
 	NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
 	order by first name.
@@ -2155,6 +2155,11 @@
     </listitem>
 
     <listitem>
+      <para>David Demelier
+	<email>markand@malikania.fr</email></para>
+    </listitem>
+
+    <listitem>
       <para>David Filo</para>
     </listitem>
 
@@ -3151,6 +3156,11 @@
     </listitem>
 
     <listitem>
+      <para>Fr&eacute;d&eacute;ric Praca
+	<email>frederic.praca@freebsd-fr.org</email></para>
+    </listitem>
+
+    <listitem>
       <para>Frederick Earl Gray
 	<email>fgray@rice.edu</email></para>
     </listitem>
@@ -7766,6 +7776,11 @@
     </listitem>
 
     <listitem>
+      <para>Pavel I Volkov
+	<email>pavelivolkov@googlemail.com</email></para>
+    </listitem>
+
+    <listitem>
       <para>Pawel Pekala
 	<email>c0rn@o2.pl</email></para>
     </listitem>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 (text+ko) ====

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v 1.11 2004/11/29 21:43:34 ceri Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml,v 1.12 2010/08/08 13:54:35 jkois Exp $ -->
 <!-- FreeBSD Documentation Project -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1069,7 +1069,7 @@
 	  systems will probably find it cheaper to simply upgrade to Windows
 	  NT Workstation or Win2K.</para>
 
-	<para>ACITS LPR and Win95 have a few printing idosyncracies.  Most
+	<para>ACITS LPR and Win95 have a few printing idiosyncrasies.  Most
 	  Win95 programs, such as Microsoft Word, expect print output to be
 	  spooled on the local hard drive and then metered out to a printer
 	  that is plugged into the parallel port.  Network printing, on the
@@ -1846,7 +1846,7 @@
 	  <literal>nec</literal> in both the name of the printer and the name
 	  of the Spool directory.  With the print spooler LPD, the Spool
 	  directories <emphasis>must</emphasis> be different from each other,
-	  or the spooler gets confused and doesen't print.</para>
+	  or the spooler gets confused and doesn't print.</para>
 
 	<para>After the <filename>/etc/printcap</filename> is modified, the
 	  root user must create the <filename>/var/spool/output/NEC</filename>

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/dev-model/book.sgml#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/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.17 2009/06/03 22:31:36 linimon Exp $
+  - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.18 2010/08/08 13:54:36 jkois Exp $
   -->
 
 <!DOCTYPE book PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -2381,7 +2381,7 @@
                     the FreeBSD web site</ulink>. It shows the number of ports
                     available to FreeBSD in the period 1995 to 2005. It looks
                     like the curve has first grown exponentionally, and then
-                    since the middle of 2001 grown linerly.
+                    since the middle of 2001 grown linearly.
                 </para>
 
                 <para>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.13 2009/04/29 17:46:49 gabor Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml,v 1.14 2010/08/08 13:54:36 jkois Exp $
 -->
 
   <chapter id="l10n">
@@ -315,7 +315,7 @@
 	  catalogs with the <makevar>NLSSRCDIR</makevar> &man.make.1;
 	  variable.  The default name of the precompiled catalog files
 	  also follow the naming convention mentioned before.  It can be
-	  overriden by setting the <makevar>NLSNAME</makevar> variable.
+	  overridden by setting the <makevar>NLSNAME</makevar> variable.
 	  There are other options to fine tune the processing of the catalog
 	  files but usually it is not needed, thus they are not described
 	  here.  For further information on <filename>bsd.nls.mk</filename>,

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

@@ -15,7 +15,7 @@
      author to assign us the copyright.  For now, it is valuable
      content so it should stay.
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.18 2010/02/17 18:20:32 jhb Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml,v 1.19 2010/08/10 20:40:36 jkois Exp $
 -->
 
 <chapter id="x86">
@@ -3152,7 +3152,7 @@
 </programlisting>
 
 <warning><para>
-Do not use this program on files stored on a disk formated
+Do not use this program on files stored on a disk formatted
 by <acronym>&ms-dos;</acronym> or &windows;. There seems to be a
 subtle bug in the FreeBSD code when using <function role="syscall">mmap</function>
 on these drives mounted under FreeBSD: If the file is over

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#29 (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.1124 2010/07/30 21:34:30 pgj Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1126 2010/08/10 10:11:15 pgj Exp $</pubdate>
 
     <copyright>
       <year>1995</year>
@@ -7035,7 +7035,7 @@
 	    use your mouse on one or more virtual consoles,
 	    <emphasis>and</emphasis> use X, see <xref
 	      linkend="moused" remap="another section"> and set up
-	    moused.</para>
+	    &man.moused.8;.</para>
 
 	  <para>Then edit <filename>/etc/X11/xorg.conf</filename> and
 	    make sure you have the following lines:</para>
@@ -7045,6 +7045,15 @@
    Option          "Device" "/dev/sysmouse"
 .....</programlisting>
 
+	  <para>Starting with &xorg; version 7.4, the
+	    <literal>InputDevice</literal> sections in
+	    <filename>xorg.conf</filename> are ignored in favor of
+	    autodetected devices.  To restore the old behavior, add the
+	    following line to the <literal>ServerLayout</literal> or
+	    <literal>ServerFlags</literal> section:</para>
+
+	  <programlisting>Option "AutoAddDevices" "false"</programlisting>
+
 	  <para>Some people prefer to use
 	    <devicename>/dev/mouse</devicename> under X.  To make this
 	    work, <devicename>/dev/mouse</devicename> should be linked

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

@@ -27,7 +27,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/books/fdp-primer/sgml-markup/chapter.sgml,v 1.79 2010/03/14 22:26:02 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml,v 1.80 2010/08/08 13:54:36 jkois Exp $
 -->
 
 <chapter id="sgml-markup">
@@ -1708,7 +1708,7 @@
 	<para>You will frequently want to refer to both applications and
 	  commands when writing documentation.  The distinction between
 	  them is simple: an application is the name for a suite (or possibly
-	  just 1) of programs that fulfil a particular task.  A command is the
+	  just 1) of programs that fulfill a particular task.  A command is the
 	  name of a program that the user can run.</para>
 
 	<para>In addition, you will occasionally need to list one or more of

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

@@ -27,7 +27,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/books/fdp-primer/sgml-primer/chapter.sgml,v 1.49 2008/12/07 22:03:48 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml,v 1.50 2010/08/10 11:48:17 pgj Exp $
 -->
 
 <chapter id="sgml-primer">
@@ -412,23 +412,23 @@
 	  <para>Try to validate this file using an SGML parser.</para>
 
 	  <para>Part of <filename role="package">textproc/docproj</filename> is the
-	    <command>nsgmls</command> <link linkend="sgml-primer-validating">validating
-	    parser</link>.  Normally, <command>nsgmls</command> reads in a document
+	    <command>onsgmls</command> <link linkend="sgml-primer-validating">validating
+	    parser</link>.  Normally, <command>onsgmls</command> reads in a document
 	    marked up according to an SGML DTD and returns a copy of the
 	    document's Element Structure Information Set (ESIS, but that is
 	    not important right now).</para>
 
-	  <para>However, when <command>nsgmls</command> is given the <option>-s</option>
-	    parameter, <command>nsgmls</command> will suppress its normal output, and
+	  <para>However, when <command>onsgmls</command> is given the <option>-s</option>
+	    parameter, <command>onsgmls</command> will suppress its normal output, and
 	    just print error messages.  This makes it a useful way to check to
 	    see if your document is valid or not.</para>
 
-	  <para>Use <command>nsgmls</command> to check that your document is
+	  <para>Use <command>onsgmls</command> to check that your document is
 	    valid:</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput></screen>
+          <screen>&prompt.user; <userinput>onsgmls -s example.sgml</userinput></screen>
 
-	  <para>As you will see, <command>nsgmls</command> returns without displaying any
+	  <para>As you will see, <command>onsgmls</command> returns without displaying any
 	    output.  This means that your document validated
 	    successfully.</para>
 	</step>
@@ -438,11 +438,11 @@
 	    removing the <sgmltag>title</sgmltag> and
 	    <sgmltag>/title</sgmltag> tags, and re-run the validation.</para>
 
-          <screen>&prompt.user; <userinput>nsgmls -s example.sgml</userinput>
-nsgmls:example.sgml:5:4:E: character data is not allowed here
-nsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
+          <screen>&prompt.user; <userinput>onsgmls -s example.sgml</userinput>
+onsgmls:example.sgml:5:4:E: character data is not allowed here
+onsgmls:example.sgml:6:8:E: end tag for "HEAD" which is not finished</screen>
 
-	  <para>The error output from <command>nsgmls</command> is organized into
+	  <para>The error output from <command>onsgmls</command> is organized into
 	    colon-separated groups, or columns.</para>
 
 	  <informaltable frame="none" pgwide="1">
@@ -458,7 +458,7 @@
 		<row>
 		  <entry>1</entry>
 		  <entry>The name of the program generating the error.  This
-		    will always be <literal>nsgmls</literal>.</entry>
+		    will always be <literal>onsgmls</literal>.</entry>
 		</row>
 
 		<row>
@@ -483,8 +483,8 @@
 		    message, <literal>W</literal> is for warnings, and
 		    <literal>E</literal> is for errors<footnote>
 		      <para>It is not always the fifth column either.
-			<command>nsgmls -sv</command> displays
-			<literal>nsgmls:I: SP version "1.3"</literal>
+			<command>onsgmls -sv</command> displays
+			<literal>onsgmls:I: "OpenSP" version "1.5.2"</literal>
 			(depending on the installed version).  As you can see,
 			this is an informational message.</para>
 		    </footnote>, and <literal>X</literal> is for
@@ -512,7 +512,7 @@
 
 	  <para>The second error is because <sgmltag>head</sgmltag> elements
 	    <emphasis>must</emphasis> contain a <sgmltag>title</sgmltag>
-	    element.  Because it does not <command>nsgmls</command> considers that the
+	    element.  Because it does not <command>onsgmls</command> considers that the
 	    element has not been properly finished.  However, the closing tag
 	    indicates that the element has been closed before it has been
 	    finished.</para>
@@ -894,13 +894,13 @@
       <procedure>
 	<step>
 	  <para>Add some comments to <filename>example.sgml</filename>, and
-	    check that the file still validates using <command>nsgmls</command>.</para>
+	    check that the file still validates using <command>onsgmls</command>.</para>
 	</step>
 
 	<step>
 	  <para>Add some invalid comments to
 	    <filename>example.sgml</filename>, and see the error messages that
-	    <command>nsgmls</command> gives when it encounters an invalid comment.</para>
+	    <command>onsgmls</command> gives when it encounters an invalid comment.</para>
 	</step>
       </procedure>
     </sect2>
@@ -1049,7 +1049,7 @@
 	</step>
 
 	<step>
-	  <para>Validate the document using <command>nsgmls</command>.</para>
+	  <para>Validate the document using <command>onsgmls</command>.</para>
 	</step>
 
 	<step>
@@ -1075,9 +1075,9 @@
 	    SGML is to expand all the entity references in the document,
 	    replacing the entities with the text that they represent.</para>
 
-	  <para>You can use <command>sgmlnorm</command> to do this.</para>
+	  <para>You can use <command>osgmlnorm</command> to do this.</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>osgmlnorm example.sgml &gt; example.html</userinput></screen>
 
 	  <para>You should find a normalized (i.e., entity references
 	    expanded) copy of your document in
@@ -1086,12 +1086,12 @@
 	</step>
 
 	<step>
-	  <para>If you look at the output from <command>sgmlnorm</command>
+	  <para>If you look at the output from <command>osgmlnorm</command>
 	    you will see that it does not include a DOCTYPE declaration at
 	    the start.  To include this you need to use the <option>-d</option>
 	    option:</para>
 
-          <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+          <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
 	</step>
       </procedure>
     </sect2>
@@ -1249,7 +1249,7 @@
 	    <para>Produce <filename>example.html</filename> by normalizing
 	      <filename>example.sgml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
@@ -1306,7 +1306,7 @@
 	    <para>Produce <filename>example.html</filename> by normalizing
 	      <filename>example.sgml</filename>.</para>
 
-            <screen>&prompt.user; <userinput>sgmlnorm -d example.sgml &gt; example.html</userinput></screen>
+            <screen>&prompt.user; <userinput>osgmlnorm -d example.sgml &gt; example.html</userinput></screen>
 	  </step>
 
 	  <step>
@@ -1553,7 +1553,7 @@
 	</step>
 
 	<step>
-	  <para>Normalize this file using &man.sgmlnorm.1; and examine the
+	  <para>Normalize this file using <command>osgmlnorm</command> and examine the
 	    output.  Notice which paragraphs have appeared, which have
 	    disappeared, and what has happened to the content of the CDATA
 	    marked section.</para>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.294 2010/05/27 09:52:11 simon Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.295 2010/08/10 08:51:37 blackend Exp $
 -->
 
 <chapter id="disks">
@@ -1176,6 +1176,15 @@
       <procedure>
 	<title>ATAPI Drives</title>
 
+	<note>
+	  <para>With the help of the <link
+	    linkend="atapicam">ATAPI/CAM module</link>,
+	    <command>cdda2wav</command> can also be used on ATAPI
+	    drives.  This tool is usually a better choice for most of
+	    users (jitter correction, endianness issues, etc.) than
+	    the method proposed below.</para>
+	</note>
+
 	<step>
 	  <para>The ATAPI CD driver makes each track available as
 	    <filename>/dev/acd<replaceable>d</replaceable>t<replaceable>nn</replaceable></filename>,

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.93 2010/07/17 05:20:55 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.94 2010/08/10 12:20:24 pgj Exp $
 -->
 
 <chapter id="firewalls">
@@ -932,7 +932,7 @@
       <para>If the packet is a <acronym>TCP</acronym> packet, there
 	will be an additional field starting with a hyphen followed by
 	letters corresponding to any flags that were set.  See the
-	&man.ipmon.8; manual page for a list of letters and their
+	&man.ipf.5; manual page for a list of letters and their
 	flags.</para>
 
       <para>If the packet is an ICMP packet, there will be two fields

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.48 2009/05/06 14:12:13 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml,v 1.49 2010/08/14 01:27:23 obrien Exp $
 
 -->
 
@@ -755,8 +755,8 @@
       <devicename>da4</devicename> is a new <acronym>SCSI</acronym>
       disk:</para>
 
-    <screen>&prompt.root; <userinput>gjournal label /dev/da4</userinput>
-&prompt.root; <userinput>gjournal load</userinput></screen>
+    <screen>&prompt.root; <userinput>gjournal load</userinput>
+      &prompt.root; <userinput>gjournal label /dev/da4</userinput></screen>
 
     <para>At this point, there should be a
       <devicename>/dev/da4</devicename> device node and a

==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#85 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1069 2010/08/04 17:58:06 pgj Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.1071 2010/08/11 19:37:15 pgj Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -962,7 +962,7 @@
 
 	  <para>It is expected that <makevar>PORTEPOCH</makevar> will
 	    not be used for the majority of ports, and that sensible
-	    use of <makevar>PORTVERSION</makevar> can often pre-empt
+	    use of <makevar>PORTVERSION</makevar> can often preempt
 	    it becoming necessary if a future release of the software
 	    should change the version structure. However, care is
 	    needed by FreeBSD porters when a vendor release is made
@@ -1162,7 +1162,7 @@
 	    part of the directory name in a family of ports), the
 	    <replaceable>-compiled.specifics</replaceable> part should state
 	    the compiled-in defaults (the hyphen is optional).  Examples are
-	    papersize and font units.</para>
+	    paper size and font units.</para>
 
 	  <para>The <replaceable>-compiled.specifics</replaceable> part
 	    should be set in the <makevar>PKGNAMESUFFIX</makevar>
@@ -1315,7 +1315,7 @@
 	      <entry>psutils</entry>
 	      <entry>-letter</entry>
 	      <entry>1.13</entry>
-	      <entry>Papersize hardcoded at package build time</entry>
+	      <entry>Paper size hardcoded at package build time</entry>
 	    </row>
 
 	    <row>
@@ -3108,7 +3108,7 @@
 	  make sure you also add them to <filename>distinfo</filename>.
 	  Also, the additional files will normally be extracted into
 	  <makevar>WRKDIR</makevar> as well, which for some ports may
-	  lead to undesirable sideeffects and require special handling.</para>
+	  lead to undesirable side effects and require special handling.</para>
       </sect2>
     </sect1>
 
@@ -3283,33 +3283,28 @@
 	    part can be omitted if it is the same as
 	    <makevar>DEPENDS_TARGET</makevar>.</para>
 
-	  <para>Quite common situation is when
+	  <para>A quite common situation is when
 	    <makevar>RUN_DEPENDS</makevar> is literally the same as
 	    <makevar>BUILD_DEPENDS</makevar>, especially if ported
 	    software is written in a scripted language or if it requires
-	    the same run-time environment used to build it.  In this
-	    case, it is very tempting, and indeed natural to directly
-	    assign one to another:</para>
+	    the same build and run-time environment.  In this
+	    case, it is both tempting and intuitive to directly
+	    assign one to the other:</para>
 
 	  <programlisting>RUN_DEPENDS= ${BUILD_DEPENDS}</programlisting>
 
-	  <para>However, doing so can and often will result in
-	    run-time dependencies be polluted by superfluous entries, not
-	    present in original port's <makevar>BUILD_DEPENDS</makevar>.
-	    It happens due to the fact that &man.make.1 is being lazy
-	    when it evaluates assignments like these.  Most probably
-	    additional dependencies will be pulled by
-	    <filename>ports/Mk/bsd.*.mk</filename> when processing
-	    <makevar>USE_<replaceable>*</replaceable></makevar>
-	    variables, which most ports contain.  For example, such
-	    direct assignment along with
-	    <literal>USE_GMAKE=yes</literal> will bring
-	    <application>gmake</application> into
-	    <makevar>RUN_DEPENDS</makevar>, despite that it was not
-	    included explicitly in <makevar>BUILD_DEPENDS</makevar>.  To
-	    prevent this from happening, immediate expansion assignment
-	    should be used, i.e. expand the value before assigning it
-	    to the variable:</para>
+	  <para>However, such assignment can pollute run-time dependencies
+	    with entries not defined in the port's original <makevar>BUILD_DEPENDS</makevar>.
+	    This happens because of &man.make.1;'s lazy evaluation of variable
+	    assignment.  Consider a <filename>Makefile</filename> with 
+	    <makevar>USE_<replaceable>*</replaceable></makevar> variables, which
+	    are processed by <filename>ports/Mk/bsd.*.mk</filename> to augment
+	    initial build dependencies.  For example, <literal>USE_GMAKE=yes</literal>
+	    adds <filename role="package">devel/gmake</filename> to
+	    <makevar>BUILD_DEPENDS</makevar>. To prevent such additional dependencies
+	    from polluting <makevar>RUN_DEPENDS</makevar>, take care to assign
+	    with expansion, i.e. expand the value before assigning it to the 
+	    variable:</para>
 
 	    <programlisting>RUN_DEPENDS:=  ${BUILD_DEPENDS}</programlisting>
 	</sect2>
@@ -3885,7 +3880,7 @@
 	      check for
 	      <filename>/var/db/ports/<replaceable>portname</replaceable>/options</filename>.
 	      If that file does not exist, it will use the values of
-	      <makevar>OPTIONS</makevar> to create a dialogbox where the options
+	      <makevar>OPTIONS</makevar> to create a dialog box where the options
 	      can be enabled or disabled.  Then the
 	      <filename>options</filename> file is saved and the selected
 	      variables will be used when building the port.</para>
@@ -5795,7 +5790,7 @@
 	      neglect to look for includes and/or libraries in the X11
 	      directories.  You can tell <command>qmake</command> to
 	      add directories to the include and library searchpaths
-	      via the commandline, for example:</para>
+	      via the command line, for example:</para>
 
 	    <programlisting>${QMAKE} -unix PREFIX=${PREFIX} INCLUDEPATH+=${LOCALBASE}/include \
 	LIBS+=-L${LOCALBASE}/lib sillyapp.pro</programlisting>
@@ -7978,7 +7973,7 @@
 	      <row>
 		<entry><literal>tolua</literal></entry>
 
-		<entry>Library for accesing C/C++ code</entry>
+		<entry>Library for accessing C/C++ code</entry>
 
 		<entry><literal>4.0-5.0</literal></entry>
 	      </row>
@@ -12462,7 +12457,7 @@
 		    <entry>700044</entry>
 		    <entry>June 7, 2007</entry>
 		    <entry>7.0-CURRENT after changing the argument for
-		      vn_open()/VOP_OPEN() from filedescriptor index to the
+		      vn_open()/VOP_OPEN() from file descriptor index to the
 		      struct file *.</entry>
 		  </row>
 
@@ -14161,7 +14156,7 @@
 	    <note>
 	      <para>If a port would conflict with a currently installed
 		port (for example, if they install a file in the same
-		place that perfoms a different function),
+		place that performs a different function),
 		<link linkend="conflicts">use
 		<makevar>CONFLICTS</makevar> instead</link>.
 		<makevar>CONFLICTS</makevar> will set
@@ -14259,7 +14254,7 @@
 	<para>The correct way for a <filename>Makefile</filename> to
 	  signal that the port can not be installed due to some external
 	  factor (for instance, the user has specified an illegal
-	  combination of build options) is to set a nonblank value to
+	  combination of build options) is to set a non-blank value to
 	  <makevar>IGNORE</makevar>.  This value will be formatted and
 	  shown to the user by <command>make install</command>.</para>
 

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

@@ -1,7 +1,7 @@
 <!-- -*- sgml -*-
      DocBook Miscellaneous FreeBSD Entities.
 
-     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.126 2010/07/25 10:26:43 manolis Exp $
+     $FreeBSD: doc/share/sgml/freebsd.ent,v 1.127 2010/08/10 10:28:44 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
@@ -48,7 +48,7 @@
 <!-- Use an entity for the X.Org X server -->
 
 <!ENTITY xorg "Xorg">
-<!ENTITY xorg.version "7.4">
+<!ENTITY xorg.version "7.5">
 
 <!-- Use an entity for DTrace to avoid spelling
      mistakes stem from unusual capitalization -->

==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#17 (text+ko) ====

@@ -34,7 +34,7 @@
 # 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.253 2010/08/04 17:17:58 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -630,6 +630,7 @@
 <meta name="robots" content="nofollow" />
 <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type" />
 <link rel="search" type="application/opensearchdescription+xml" href="http://www.freebsd.org/search/opensearch/man.xml" title="FreeBSD Manpages" />
+<link rel="search" type="application/opensearchdescription+xml" href="http://www.freebsd.org/search/opensearch/man-freebsd-release-ports.xml" title="FreeBSD + Ports Manpages" />
 <style type="text/css">
 <!--
 b { color: #996600; }
@@ -1442,7 +1443,7 @@
     }
 
     local $id =
-      '$FreeBSD: www/en/cgi/man.cgi,v 1.253 2010/08/04 17:17:58 wosch Exp $';
+      '$FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $';
     return qq{\
 <pre>
 Copyright (c) 1996-2010 <a href="$mailtoURL">Wolfram Schneider</a>

==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#20 (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.487 2010/06/26 21:46:17 wilko Exp $">
+<!ENTITY date "$FreeBSD: www/en/donations/wantlist.sgml,v 1.489 2010/08/10 20:28:33 dougb Exp $">
 <!ENTITY title "FreeBSD Developers Want List">
 <!ENTITY email 'donations'>
 <!ENTITY % navinclude.about "INCLUDE">
@@ -55,13 +55,6 @@
       </tr>
 
       <tr>
-	<td>cognet</td>
-	<td>France</td>
-	<td>A Zaurus, with hard disk preferably.</td>
-	<td>FreeBSD/arm development.</td>
-      </tr>
-
-      <tr>
 	<td>des</td>
 	<td>Norway</td>
 	<td>Mac Mini with 1 GB RAM, no peripherals</td>
@@ -380,6 +373,14 @@
 	<td>AMD64 machine, minimum 256 M memory, any size hard drive.</td>
 	<td>Ports testing and building.</td>
       </tr>
+
+      <tr>
+	<td>dougb</td>
+	<td>CA, US</td>
+	<td>Laptop HD, SATA-300, 200+ Gb, good performance</td>
+	<td>Replace aging HD in my day-to-day laptop running
+	  FreeBSD-current</td>
+      </tr>
     </table>
 
   &footer;

==== //depot/projects/docproj_nl/www/en/search/opensearch/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/search/opensearch/Makefile,v 1.6 2009/03/22 14:53:36 wosch Exp $
+# $FreeBSD: www/en/search/opensearch/Makefile,v 1.7 2010/08/09 19:35:47 wosch Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -14,6 +14,7 @@
 DATA+=	opensearch.js
 
 DATA+=	man.xml
+DATA+=	man-freebsd-release-ports.xml
 DATA+=	ports.xml 
 DATA+=	query-pr.xml
 DATA+=	web.xml

==== //depot/projects/docproj_nl/www/en/search/opensearch/opensearch.sgml#4 (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/search/opensearch/opensearch.sgml,v 1.5 2009/03/22 14:46:57 wosch Exp $">
+<!ENTITY date "$FreeBSD: www/en/search/opensearch/opensearch.sgml,v 1.6 2010/08/09 19:42:15 wosch Exp $">
 <!ENTITY title "FreeBSD OpenSearch Plugins">
 ]>
 
@@ -30,6 +30,7 @@
 	<h3>By the FreeBSD.org web site</h3>
         <ul>
           <li><a href="man.xml" onclick= "return install(this)">FreeBSD Manual Pages</a></li>
+          <li><a href="man-freebsd-release-ports.xml" onclick= "return install(this)">FreeBSD + Ports Manual Pages</a></li>
           <li><a href="ports.xml" onclick= "return install(this)">FreeBSD Ports and Packages Collection</a></li>
           <li><a href="query-pr.xml" onclick= "return install(this)">FreeBSD Problem Reports</a></li>
           <li><a href="web-all.xml" onclick= "return install(this)">FreeBSD Fulltext Search Web + Manual + Ports Pages</a></li>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#25 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">;
-<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.119 2010/07/23 13:40:43 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.121 2010/08/10 21:01:12 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.119 2010/07/23 13:40:43 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.121 2010/08/10 21:01:12 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -80,6 +80,21 @@
     </description>
   </entry>
 
+  <entry id="ateamsystems" category="namerica">
+    <name>A-Team Systems</name>
+    <url>http://www.ateamsystems.com/</url>;
+    <description>
+      A-Team Systems has over 15 years of experience helping clients
+      leverage the power of &os; in combination with other open source
+      software such as PHP, MySQL and Apache in a secure, customized
+      and cohesive way.  We've been with &os; since version 1.0!  We
+      can help you with your existing deployment or future plans:
+      From encrypted backups to web and mail servers.  Visit our
+      <a href="http://www.ateamsystems.com/">website</a>; for more
+      information.
+    </description>
+  </entry>
+
   <entry id="ALE" category="europe">
     <name>ALE Software</name>
     <url>http://linux.wroclaw.pl/</url>;
@@ -2654,17 +2669,6 @@
     </description>
   </entry>
 
-  <entry id="officialunix" category="namerica">
-    <name>Officialunix</name>
-    <url>http://www.officialunix.com</url>;
-    <description>
-      Officialunix, is a small company based in Mexico.  It offers
-      consulting, Administration, and System Admin services. It also
-      sells CD's which a small percentage is given back to each Open
-      Source project it sells products for.
-    </description>
-  </entry>
-
   <entry id="mejojose" category="asia">
     <name>Mejo Jose</name>
     <url>http://www.kannayath.com</url>;

==== //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#6 (text+ko) ====

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE entries PUBLIC "-//FreeBSD//DTD FreeBSD XML Database for Commercial Gallery//EN"
                          "http://www.FreeBSD.org/XML/www/share/sgml/gallery.dtd">;
-<!-- $FreeBSD: www/share/sgml/commercial.software.xml,v 1.14 2010/07/21 22:59:10 jkois Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.software.xml,v 1.24 2010/08/08 16:03:56 jkois Exp $ -->
 
 <entries>
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.14 2010/07/21 22:59:10 jkois Exp $
+      $FreeBSD: www/share/sgml/commercial.software.xml,v 1.24 2010/08/08 16:03:56 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -151,24 +151,6 @@
     </description>
   </entry>
 
-  <entry id="CForge" category="DEV">
-    <name>C-Forge</name>
-    <url>http://www.codeforge.com/</url>;
-    <description>
-      C-Forge (pronounced Code Forge) is a multi-user integrated
-      development environment that provides full project management and
-      complete edit/compile/debug cycle support. Features include complete
-      abstraction of the "makefile" concept, a Project Manager for visual
-      presentation of project structure and component status using a
-      dependency tree and a separate "desktop" area showing work in
-      progress, support for C/C++, Perl, Oracle ProC/C++, Tcl, PHP, Java,
-      JavaScript, Python, Qt, Pascal, Free Pascal, FORTRAN, TeX/LaTeX,
-      SGML, Modula-2, and Assembler, integrated revision control, fully
-      configurable programmer's editor, and much more. An evaluation
-      version is available for download.
-    </description>
-  </entry>
-
   <entry id="CactusInternational" category="SYSADMIN">
     <name>Cactus International Inc.</name>
     <url>http://www.cactus.com/</url>;
@@ -552,19 +534,6 @@
     </description>
   </entry>
 
-  <entry id="HighWind" category="NETWORK">
-    <name>HighWind Software</name>
-    <url>http://www.highwind.com/</url>;
-    <description>
-      HighWind Software develops <em>Cyclone</em>, <em>Typhoon</em>, and
-      <em>Breeze</em>. USENET server products are available for FreeBSD 3.0
-      and later. HighWind products are carrier-class Internet News Servers
-      and are in wide-spread use at almost every major ISP involved in
-      USENET. Free trials are available at <a
-      href="http://www.highwind.com/">www.highwind.com</a>.
-    </description>
-  </entry>
-
   <entry id="HKS" category="MISC">
     <name>HKS, Incorporated</name>
     <url>http://www.hks.net/</url>;
@@ -712,24 +681,6 @@
     </description>
   </entry>
 
-  <entry id="Joydesk" category="MISC">
-    <name>Joydesk</name>
-    <url>http://joydesk.com</url>;
-    <description>
-      Joydesk is a Web-based Groupware package from VirtualTek Corporation,
-      an ISV based in Seattle, WA. VirtualTek has developed a
-      state-of-the-art, web-based Groupware server that runs on FreeBSD and
-      allows an ISP, Portal, or virtually any website running on FreeBSD to
-      integrate web-based email, calendar, address book, message board and
-      other features. It's fully customizable, so you maintain your own
-      name and brand, installs in about 15 minutes and is offered at a low,
-      one-time cost. <a href="http://joydesk.com/download.htm">Download</a>;
-      a copy today and don't forget to <a
-      href="http://joydesk.com/signup.htm">create your free account</a> if
-      you would like to experience Joydesk's features firsthand.
-    </description>
-  </entry>
-
   <entry id="Kaspersky" category="SECURITY">
     <name>Kaspersky Lab</name>
     <url>http://www.kaspersky.com/</url>;
@@ -777,23 +728,6 @@
     </description>
   </entry>
 
-  <entry id="Lilikoi" category="NETWORK">
-    <name>Lilikoi Software</name>
-    <url>http://www.lilikoi.com/</url>;
-    <description>
-      Ceilidh, from Lilikoi Software, Inc., is a bulletin board package for
-      the World Wide Web, intra-, and extra-nets. It adds discussion forum
-      capability to Web servers, including Apache. Ceilidh's forums are
-      accessible through all browsers; its users can also opt for
-      notification of new messages by e-mail. The forums are threaded and
-      self-maintaining, with old messages being automatically deleted
-      according to a schedule chosen by the administrator and author.
-      Contact Lilikoi Software at <a
-      href="mailto:sales@lilikoi.com">sales@lilikoi.com</a>,
-      +1.619.405.4247 (Voice) or +1.619.487.0451 (Fax).
-    </description>
-  </entry>
-
   <entry id="LoneStar" category="SYSADMIN">
     <name>Lone Star Software Corp</name>
     <url>http://www.LONE-TAR.com/</url>;
@@ -1021,24 +955,6 @@
     </description>
   </entry>
 
-  <entry id="OracleVideoServer" category="MULTIMEDIA">
-    <name>Oracle Video Server</name>
-    <url>http://www.netscape.com/</url>;
-    <description>
-      Netscape-compatible browsers, <a
-      href="http://www.javasoft.com/">Java</a>; applets, <a
-      href="http://www.macromedia.com/index.html">Macromedia Director or
-      Authorware</a>, <a
-      href="http://www.asymetrix.com/products/iconauthor/"  >Asymetrix
-      IconAuthor</a>, or user-written applications. Integration with the <a
-      href="http://www.oracle.com/st/">Oracle8</a>; database (optional)
-      allows for a complete, enterprise-wide information management
-      solution. The <a
-      href="http://www.nc.com/download/svrsuit.pdf">FreeBSD (NCOS)</a>
-      version is completely compatible with versions for other platforms.
-    </description>
-  </entry>
-
   <entry id="OSATech" category="ECOMMERCE">
     <name>OSATech, Inc.</name>
     <url>http://www.osatech.com/</url>;
@@ -1070,18 +986,6 @@
     </description>
   </entry>
 
-  <entry id="PACT" category="SYSADMIN">
-    <name>PACT</name>
-    <url>http://pact.insider.org/</url>;
-    <description>
-      PACT Port Accounting and Collection Tool - is a set of programs and
-      PHP-scripts that allows for complete accounting of SNMP-queryable
-      ports, and includes detailed overview of ports and their bandwidth
-      usage. Multiple ports can be assigned to single customers. Free for
-      non-commercial use.
-    </description>
-  </entry>
-
   <entry id="Parabase" category="MISC">
     <name>Parabase Technology Inc.</name>
     <url>http://www.parabase.com</url>;
@@ -1247,25 +1151,6 @@
     </description>
   </entry>
 
-  <entry id="s3-solutions" category="NETWORK">
-    <name>S3 Smart Security Solutions</name>
-    <url>http://www.s3-solutions.de/</url>;
-    <description>
-      s3 smart security solutions offers FreeBSD based anti-spam and
-      -virus email gateway appliances.  For these appliances FreeBSD as
-      reliable foundation is complemented by SpamAssassin and ClamAV to
-      obtain the best spam- and virus-protection available in the Open
-      Source area.  A simple web-frontend allows for plug and play of
-      the appliance and guarantees ease of use for long-term deployment.
-      Available versions span from mid-size to high performance versions
-      which can be extended with clustering capabilities for high
-      availability of your email system.  For more information, please
-      visit our <a href="http://www.s3-solutions.de">web site</a> or
-      send e-mail to <a href="mailto:info@s3-solutions.de">
-	info@s3-solutions.de</a>.
-    </description>
-  </entry>
-
   <entry id="Sababeach" category="ECOMMERCE">
     <name>Sababeach</name>
     <url>http://www.sababeach.net/</url>;
@@ -1453,21 +1338,6 @@
     </description>
   </entry>
 
-  <entry id="SpecTechnologies" category="DEV">
-    <name>Specilized Technologies</name>
-    <url>http://www.spectechnologies.net</url>;
-    <description>
-      We specialize in security (firewalls, VPNs, security audits, intrusion
-      detection systems, etc.), handles installation and configuration,
-      systems integration, performance tuning, disaster recovery, network
-      architecture and programming under FreeBSD, NetBSD, OpenBSD, Linux
-      and many other commercial UNIX systems.  Based in central Kentucky. For
-      additional information e-mail us at
-      <a href="mailto:cbumgardner@spectechnologies.net">
-        cbumgardner@spectechnologies.net</a>.
-    </description>
-  </entry>
-
   <entry id="StalkerSoftware" category="NETWORK">
     <name>Stalker Software, Inc.</name>

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008141614.o7EGED70032979>