Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Oct 2008 20:14:42 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 151916 for review
Message-ID:  <200810252014.m9PKEg3x014793@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=151916

Change 151916 by rene@rene_self on 2008/10/25 20:14:24

	IFC	

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/Makefile#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#2 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#3 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#10 integrate
.. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#4 integrate
.. //depot/projects/docproj_nl/www/share/sgml/news.xml#13 integrate
.. //depot/projects/docproj_nl/www/share/sgml/release.ent#4 integrate

Differences ...

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/Makefile#2 (text+ko) ====

@@ -1,12 +1,11 @@
 #
-# $FreeBSD: doc/en_US.ISO8859-1/articles/cups/Makefile,v 1.1 2008/05/31 13:30:22 remko Exp $
+# $FreeBSD: doc/en_US.ISO8859-1/articles/cups/Makefile,v 1.2 2008/10/24 23:01:06 pgj Exp $
 #
 # Article: CUPS on FreeBSD
 
 DOC?= article
 
 FORMATS?= html
-WITH_ARTICLE_TOC?= YES
 
 INSTALL_COMPRESSED?=gz
 INSTALL_ONLY_COMPRESSED?=

==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/cups/article.sgml#2 (text+ko) ====

@@ -7,11 +7,11 @@
 <article>
   <articleinfo>
     <title>CUPS on FreeBSD</title>
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.1 2008/05/31 13:30:22 remko Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/cups/article.sgml,v 1.3 2008/10/24 23:18:46 pgj Exp $</pubdate>
     <authorgroup>
       <author>
 	<firstname>Chess</firstname>
-	<surname>Grifin</surname>
+	<surname>Griffin</surname>
 	<affiliation>
 	  <address><email>chess@chessgriffin.com</email></address>
 	</affiliation>
@@ -55,221 +55,219 @@
 
     <para>The main site for <application>CUPS</application> is <ulink
 	url="http://www.cups.org/"></ulink>.</para>;
+  </sect1>
 
-    <sect2 id="printing-cups-install">
-      <title>Installing the CUPS Print Server</title>
+  <sect1 id="printing-cups-install">
+    <title>Installing the CUPS Print Server</title>
 
-      <para><application>CUPS</application> can be installed from ports
-	or by using a precompiled binary package.  To install
-	<application>CUPS</application> from ports, issue the following
-	command from a root terminal:</para>
+    <para><application>CUPS</application> can be installed from ports or
+      by using a precompiled binary package.  To install
+      <application>CUPS</application> from ports, issue the following
+      command from a root terminal:</para>
 
-      <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
+    <screen>&prompt.root; <userinput>cd /usr/ports/print/cups && make install clean</userinput></screen>
 
-      <para>To install <application>CUPS</application> using a
-	precompiled binary, issue the following command from a root
-	terminal:</para>
+    <para>To install <application>CUPS</application> using a precompiled
+      binary, issue the following command from a root terminal:</para>
 
-      <screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
+    <screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
 
-      <para>Other optional, but recommended, ports or packages are
-	<application>print/gutenprint-cups</application> and
-	<application>print/hplip</application>, both of which add
-	drivers and utilities for a variety of printers.  Once
-	installed, the <application>CUPS</application> configuration
-	files can be found in the directory
-	<filename>/usr/local/etc/cups</filename>.</para>
-    </sect2>
+    <para>Other optional, but recommended, ports or packages are
+      <filename role="package">print/gutenprint-cups</filename> and
+      <filename role="package">print/hplip</filename>, both of which add
+      drivers and utilities for a variety of printers.  Once installed,
+      the <application>CUPS</application> configuration files can be
+      found in the directory
+      <filename>/usr/local/etc/cups</filename>.</para>
+  </sect1>
 
-    <sect2 id="printing-cups-configuring-server">
-      <title>Configuring the CUPS Print Server</title>
+  <sect1 id="printing-cups-configuring-server">
+    <title>Configuring the CUPS Print Server</title>
 
-      <para>After installation, a few files must edited in order to
-	configure the <application>CUPS</application> server.  First,
-	create or modify, as the case may be, the file
-	<filename>/etc/devfs.rules</filename> and add the following
-	information to set the proper permissions on all potential
-	printer devices and to associate printers with the cups user
-	group:</para>
+    <para>After installation, a few files must edited in order to
+      configure the <application>CUPS</application> server.  First,
+      create or modify, as the case may be, the file
+      <filename>/etc/devfs.rules</filename> and add the following
+      information to set the proper permissions on all potential printer
+      devices and to associate printers with the
+      <groupname>cups</groupname> user group:</para>
 
-      <programlisting>[system=10]
+    <programlisting>[system=10]
 add path 'unlpt*' mode 0660 group cups
 add path 'ulpt*' mode 0660 group cups
 add path 'lpt*' mode 0660 group cups</programlisting>
 
-      <para>Next, add two lines to <filename>/etc/rc.conf</filename>
-	as follows:</para>
+    <para>Next, add two lines to <filename>/etc/rc.conf</filename> as
+      follows:</para>
 
-      <programlisting>cupsd_enable="YES"
+    <programlisting>cupsd_enable="YES"
 devfs_system_ruleset="system"</programlisting>
 
-      <para>These two entries will start the
-	<application>CUPS</application> print server on boot and invoke
-	the local devfs rule created above, respectively.</para>
+    <para>These two entries will start the
+      <application>CUPS</application> print server on boot and invoke
+      the local devfs rule created above, respectively.</para>
+
+    <para>In order to enable <application>CUPS</application> printing
+      under certain &microsoft.windows; clients, the line below should
+      be uncommented in
+      <filename>/usr/local/etc/cups/mime.types</filename> and
+      <filename>/usr/local/etc/cups/mime.convs</filename>:</para>
 
-      <para>In order to enable <application>CUPS</application> printing
-	under certain &microsoft.windows; clients, the line
-	<programlisting>application/octet-stream</programlisting> should be
-	uncommented in <filename>/usr/local/etc/cups/mime.types</filename>
-	and <filename>/usr/local/etc/cups/mime.convs</filename>.</para>
+    <programlisting>application/octet-stream</programlisting>
 
-      <para>Once these changes have been made, the &man.devfs.8; and
-	<application>CUPS</application> systems must both be restarted,
-	either by rebooting the computer or issuing the following two
-	commands in a root terminal:</para>
+    <para>Once these changes have been made, the &man.devfs.8; and
+      <application>CUPS</application> systems must both be restarted,
+      either by rebooting the computer or issuing the following two
+      commands in a root terminal:</para>
 
-      <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput>
+    <screen>&prompt.root; <userinput>/etc/rc.d/devfs restart</userinput>
 &prompt.root; <userinput>/usr/local/etc/rc.d/cupsd restart</userinput></screen>
+  </sect1>
 
-    </sect2>
+  <sect1 id="printing-cups-configuring-printers">
+    <title>Configuring Printers on the CUPS Print Server</title>
 
-    <sect2 id="printing-cups-configuring-printers">
-      <title>Configuring Printers on the CUPS Print Server</title>
+    <para>After the <application>CUPS</application> system has been
+      installed and configured, the administrator can begin configuring
+      the local printers attached to the <application>CUPS</application>
+      print server.  This part of the process is very similar, if not
+      identical, to configuring <application>CUPS</application> printers
+      on other &unix;-based operating systems, such as a &linux;
+      distribution.</para>
 
-      <para>After the <application>CUPS</application> system has been
-	installed and configured, the administrator can begin configuring
-	the local printers attached to the
-	<application>CUPS</application> print server.  This part of the
-	process is very similar, if not identical, to configuring
-	<application>CUPS</application> printers on other &unix;-based
-	operating systems, such as a &linux; distribution.</para>
+    <para>The primary means for managing and administering the
+      <application>CUPS</application> server is through the web-based
+      interface, which can be found by launching a web browser and
+      entering <ulink url="http://localhost:631"></ulink>; in the
+      browser's URL bar.  If the <application>CUPS</application> server
+      is on another machine on the network, substitute the server's
+      local <acronym>IP</acronym> addresss for
+      <hostid>localhost</hostid>.  The <application>CUPS</application>
+      web interface is fairly self-explanatory, as there are sections
+      for managing printers and print jobs, authorizing users, and more.
+      Additionally, on the right-hand side of the Administration screen
+      are several check-boxes allowing easy access to commonly-changed
+      settings, such as whether to share published printers connected to
+      the system, whether to allow remote administration of the
+      <application>CUPS</application> server, and whether to allow users
+      additional access and privileges to the printers and print
+      jobs.</para>
 
-      <para>The primary means for managing and administering the
-	<application>CUPS</application> server is through the web-based
-	interface, which can be found by launching a web browser and
-	entering <filename>http://localhost:631</filename>; in the
-	browser's URL bar.  If the <application>CUPS</application>
-	server is on another machine on the network, substitute the
-	server's local <acronym>IP</acronym> addresss for
-	<literal>localhost</literal>. The <application>CUPS</application>
-	web interface is fairly self-explanatory, as there are sections
-	for managing printers and print jobs, authorizing users, and
-	more.  Additionally, on the right-hand side of the
-	Administration screen are several check-boxes allowing easy
-	access to commonly-changed settings, such as whether to share
-	published printers connected to the system, whether to allow
-	remote administration of the <application>CUPS</application>
-	server, and whether to allow users additional access and
-	privileges to the printers and print jobs.</para>
+    <para>Adding a printer is generally as easy as clicking <quote>Add
+      Printer</quote> at the Administration screen of the
+      <application>CUPS</application> web interface, or clicking one of
+      the <quote>New Printers Found</quote> buttons also at the
+      Administration screen.  When presented with the
+      <quote>Device</quote> drop-down box, simply select the desired
+      locally-attached printer, and then continue through the process.
+      If one has added the <filename
+      role="package">print/gutenprint-cups</filename> or <filename
+      role="package">print/hplip</filename> ports or packages as
+      referenced above, then additional print drivers will be available
+      in the subsequent screens that might provide more stability or
+      features.</para>
+  </sect1>
 
-      <para>Adding a printer is generally as easy as clicking
-	<literal>Add Printer</literal> at the Administration screen of
-	the <application>CUPS</application> web interface, or clicking
-	one of the <literal>New Printers Found</literal> buttons also
-	at the Administration screen.  When presented with the
-	<literal>Device</literal> drop-down box, simply select the
-	desired locally-attached printer, and then continue through the
-	process.  If one has added the
-	<application>print/gutenprint-cups</application> or
-	<application>print/hplip</application> ports or packages as
-	referenced above, then additional print drivers will be available
-	in the subsequent screens that might provide more stability or
-	features.</para>
-    </sect2>
+  <sect1 id="printing-cups-clients">
+    <title>Configuring CUPS Clients</title>
 
-    <sect2 id="printing-cups-clients">
-      <title>Configuring CUPS Clients</title>
+    <para>Once the <application>CUPS</application> server has been
+      configured and printers have been added and published to the
+      network, the next step is to configure the clients, or the
+      machines that are going to access the
+      <application>CUPS</application> server.  If one has a single
+      desktop machine that is acting as both server and client, then
+      much of this information may not be needed.</para>
 
-      <para>Once the <application>CUPS</application> server has been
-	configured and printers have been added and published to the
-	network, the next step is to configure the clients, or the
-	machines that are going to access the
-	<application>CUPS</application> server.  If one has a single
-	desktop machine that is acting as both server and client, then
-	much of this information may not be needed.</para>
+    <sect2 id="printing-cups-clients-unix">
+      <title>&unix; Clients</title>
 
-      <sect3 id="printing-cups-clients-unix">
-	<title>&unix; Clients</title>
+      <para><application>CUPS</application> will also need to be
+	installed on your &unix; clients.  Once
+	<application>CUPS</application> is installed on the clients,
+	then <application>CUPS</application> printers that are shared
+	across the network are often automatically discovered by the
+	printer managers for various desktop environments such as
+	<application>GNOME</application> or
+	<application>KDE</application>.  Alternatively, one can access
+	the local <application>CUPS</application> interface on the
+	client machine at <ulink url="http://localhost:631"></ulink>; and
+	click on <quote>Add Printer</quote> in the Administration
+	section.  When presented with the <quote>Device</quote>
+	drop-down box, simply select the networked
+	<application>CUPS</application> printer, if it was automatically
+	discovered, or select <literal>ipp</literal> or
+	<literal>http</literal> and enter the <acronym>IPP</acronym> or
+	<acronym>HTTP</acronym> <acronym>URI</acronym> of the networked
+	<application>CUPS</application> printer, usually in one of the
+	two following syntaxes:</para>
 
-	<para><application>CUPS</application> will also need to be
-	  installed on your &unix; clients.  Once
-	  <application>CUPS</application> is installed on the clients,
-	  then <application>CUPS</application> printers that are
-	  shared across the network are often automatically discovered by
-	  the printer managers for various desktop environments such as
-	  <application>GNOME</application> or
-	  <application>KDE</application>.  Alternatively, one can access
-	  the local <application>CUPS</application> interface on the
-	  client machine at <filename>http://localhost:631</filename>; and
-	  click on <literal>Add Printer</literal> in the Administration
-	  section.  When presented with the <literal>Device</literal>
-	  drop-down box, simply select the networked
-	  <application>CUPS</application> printer, if it was
-	  automatically discovered, or select <literal>ipp</literal> or
-	  <literal>http</literal> and enter the <acronym>IPP</acronym> or
-	  <acronym>HTTP</acronym> <acronym>URI</acronym> of the networked
-	  <application>CUPS</application> printer, usually in one of the
-	  two following syntaxes:</para>
+	<programlisting>ipp://<replaceable>server-name-or-ip</replaceable>/printers/<replaceable>printername</replaceable></programlisting>
 
-	<programlisting>ipp://server-name-or-ip/printers/printername</programlisting>
+	<programlisting>http://<replaceable>server-name-or-ip</replaceable>:631/printers/<replaceable>printername</replaceable></programlisting>;
 
-	<programlisting>http://server-name-or-ip:631/printers/printername</programlisting>;
+      <para>If the <application>CUPS</application> clients have
+	difficulty finding other <application>CUPS</application>
+	printers shared across the network, sometimes it is helpful to
+	add or create a file
+	<filename>/usr/local/etc/cups/client.conf</filename> with a
+	single entry as follows:</para>
 
-	<para>If the <application>CUPS</application> clients have
-	  difficulty finding other <application>CUPS</application>
-	  printers shared across the network, sometimes it is helpful to
-	  add or create a file
-	  <filename>/usr/local/etc/cups/client.conf</filename> with a
-	  single entry as follows:</para>
+      <programlisting>ServerName <replaceable>server-ip</replaceable></programlisting>
 
-	<programlisting>ServerName (server-ip)</programlisting>
+      <para>In this case, <replaceable>server-ip</replaceable> would be
+	replaced by the local <acronym>IP</acronym> address of the
+	<application>CUPS</application> server on the network.</para>
+    </sect2>
 
-	<para>In this case, (server-ip) would be replaced by the local
-	  <acronym>IP</acronym> address of the
-	  <application>CUPS</application> server on the network.</para>
-      </sect3>
+    <sect2 id="printing-cups-clients-windows">
+      <title>&windows; Clients</title>
 
-      <sect3 id="printing-cups-clients-windows">
-	<title>&windows; Clients</title>
+      <para>Versions of &windows; prior to XP did not have the
+	capability to natively network with <acronym>IPP</acronym>-based
+	printers.  However, &windowsxp; and later versions do have this
+	capability.  Therefore, to add a <application>CUPS</application>
+	printer in these versions of &windows; is quite easy.
+	Generally, the &windows; administrator will run the &windows;
+	<literal>Add Printer</literal> wizard, select <literal>Network
+	  Printer</literal> and then enter the <acronym>URI</acronym> in
+	the following syntax:</para>
 
-	<para>Versions of &windows; prior to XP did not have the
-	  capability to natively network with
-	  <acronym>IPP</acronym>-based printers.  However, &windowsxp;
-	  and later versions do have this capability.  Therefore, to
-	  add a <application>CUPS</application> printer in these
-	  versions of &windows; is quite easy.  Generally, the &windows;
-	  administrator will run the &windows;
-	  <literal>Add Printer</literal> wizard, select <literal>Network
-	    Printer</literal> and then enter the <acronym>URI</acronym>
-	  in the following syntax:</para>
+      <programlisting>http://<replaceable>server-name-or-ip</replaceable>:631/printers/<replaceable>printername</replaceable></programlisting>;
 
-	<programlisting>http://server-name-or-ip:631/printers/printername</programlisting>;
-
-	<para>If one has an older version of &windows; without native
-	  <acronym>IPP</acronym> printing support, then the general
-	  means of connecting to a <application>CUPS</application>
-	  printer is to use
-	  <filename role="package">net/samba3</filename> and
-	  <application>CUPS</application> together, which is a topic
-	  outside the scope of this chapter.</para>
-      </sect3>
+      <para>If one has an older version of &windows; without native
+	<acronym>IPP</acronym> printing support, then the general means
+	of connecting to a <application>CUPS</application> printer is to
+	use <filename role="package">net/samba3</filename> and
+	<application>CUPS</application> together, which is a topic
+	outside the scope of this chapter.</para>
     </sect2>
+  </sect1>
 
-    <sect2 id="printing-cups-troubleshooting">
-      <title>CUPS Troubleshooting</title>
+  <sect1 id="printing-cups-troubleshooting">
+    <title>CUPS Troubleshooting</title>
 
-      <para>Difficulties with <application>CUPS</application> often lies
-	in permissions.  First, double check the &man.devfs.8;
-	permissions as outlined above.  Next, check the actual
-	permissions of the devices created in the filesystem.  It is
-	also helpful to make sure your user is a member of the
-	<literal>cups</literal> group.  If the permissions check boxes
-	in the <literal>Administration</literal> section of the
-	<application>CUPS</application> web interface do not seem to be
-	working, another fix might be to manually backup the main
-	<application>CUPS</application> configuration file located at
-	<filename>/usr/local/etc/cups/cupsd.conf</filename> and edit the
-	various configuration options and try different combinations of
-	configuration options.  One sample
-	<filename>/usr/local/etc/cups/cupsd.conf</filename> to test is
-	listed below.  Please note that this sample
-	<filename>cupsd.conf</filename> file sacrifices security for
-	easier configuration; once the administrator successfully
-	connnects to the <application>CUPS</application> server and
-	configures the clients, it is advisable to revisit this
-	configuration file and begin locking down access.</para>
+    <para>Difficulties with <application>CUPS</application> often lies
+      in permissions.  First, double check the &man.devfs.8; permissions
+      as outlined above.  Next, check the actual permissions of the
+      devices created in the file system.  It is also helpful to make
+      sure your user is a member of the <groupname>cups</groupname>
+      group.  If the permissions check boxes in the Administration
+      section of the <application>CUPS</application> web interface do
+      not seem to be working, another fix might be to manually backup
+      the main <application>CUPS</application> configuration file
+      located at <filename>/usr/local/etc/cups/cupsd.conf</filename> and
+      edit the various configuration options and try different
+      combinations of configuration options.  One sample
+      <filename>/usr/local/etc/cups/cupsd.conf</filename> to test is
+      listed below.  Please note that this sample
+      <filename>cupsd.conf</filename> file sacrifices security for
+      easier configuration; once the administrator successfully
+      connnects to the <application>CUPS</application> server and
+      configures the clients, it is advisable to revisit this
+      configuration file and begin locking down access.</para>
 
-      <programlisting># Log general information in error_log - change "info" to "debug" for
+    <programlisting># Log general information in error_log - change "info" to "debug" for
 # troubleshooting...
 LogLevel info
 
@@ -348,32 +346,32 @@
     Order deny,allow
   &lt;/Limit&gt;
 &lt;/Policy&gt;</programlisting>
-    </sect2>
+  </sect1>
 
-    <sect2 id="printing-cups-ports-knobs">
-      <title>Fine Tuning CUPS-Related Ports</title>
+  <sect1 id="printing-cups-ports-knobs">
+    <title>Fine Tuning CUPS-Related Ports</title>
 
-      <para>If <application>CUPS</application> is going to serve as the
-	primary printing system, then one may choose to optionally add
-	certain knobs to <filename>/etc/make.conf</filename> that will
-	emphasize <application>CUPS</application> over other printing
-	options.  Some of these "knobs" that one may want to add
-	are:</para>
+    <para>If <application>CUPS</application> is going to serve as the
+      primary printing system, then one may choose to optionally add
+      certain knobs to <filename>/etc/make.conf</filename> that will
+      emphasize <application>CUPS</application> over other printing
+      options.  Some of these <quote>knobs</quote> that one may want to
+      add are:</para>
 
-      <programlisting>WITH_CUPS=YES
+    <programlisting>WITH_CUPS=YES
 CUPS_OVERWRITE_BASE=YES
 WITHOUT_LPR=YES</programlisting>
 
-      <para>The first knob, WITH_CUPS, adds
-	<application>CUPS</application> support to ports where
-	applicable.  The second knob, CUPS_OVERWRITE_BASE, will fix
-	certain symlinks and paths that would otherwise apply to the
-	default &os; printing system, <application>LPR</application>,
-	and will prevent these fixes from being reverted upon the next
-	"buildworld" system upgrade.  The third knob, WITHOUT_LPR, will
-	prevent <application>LPR</application> support from being added
-	to ports where applicable.</para>
-    </sect2>
+    <para>The first knob, <makevar>WITH_CUPS</makevar>, adds
+      <application>CUPS</application> support to ports where applicable.
+      The second knob, <makevar>CUPS_OVERWRITE_BASE</makevar>, will fix
+      certain symlinks and paths that would otherwise apply to the
+      default &os; printing system, <application>LPR</application>, and
+      will prevent these fixes from being reverted upon the next
+      <maketarget>buildworld</maketarget> system upgrade.  The third
+      knob, <makevar>WITHOUT_LPR</makevar>, will prevent
+      <application>LPR</application> support from being added to ports
+      where applicable.</para>
   </sect1>
 </article>
 

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

@@ -1,6 +1,6 @@
 <!--
      The FreeBSD Documentation Project
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.76 2008/06/15 18:39:28 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.78 2008/10/25 17:16:32 blackend Exp $
 -->
 
 <chapter id="desktop">
@@ -285,7 +285,7 @@
 	plugin should be listed there now.  If it is not, as
 	<username>root</username>, run the following command:</para>
 
-      <screen>&prompt.root; <userinput>ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \
+      <screen>&prompt.root; <userinput>ln -s /usr/local/diablo-jre1.6.0/plugin/i386/ns7/libjavaplugin_oji.so \
   /usr/local/lib/browser_plugins/</userinput></screen>
 
       <para>then relaunch your browser.</para>
@@ -378,7 +378,7 @@
       <para><application>Konqueror</application> also supports <application>&flash;</application>; a <quote>How To</quote> guide
 	for getting <application>&flash;</application> support on
 	<application>Konqueror</application>
-	is available at <ulink url="http://freebsd.kde.org/howto.php"></ulink>.</para>;
+	is available at <ulink url="http://freebsd.kde.org/howtos/konqueror-flash.php"></ulink>.</para>;
     </sect2>
   </sect1>
 

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.283 2008/09/28 12:52:01 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml,v 1.284 2008/10/23 18:45:19 blackend Exp $
 -->
 
 <chapter id="ports">
@@ -1140,7 +1140,7 @@
 	  another option is to execute <command>make
 	  <maketarget>rmconfig</maketarget></command> which will remove all
 	  selected options and allow you to start over.  All of these options,
-	  and others, are explained in great detail in in the man page for
+	  and others, are explained in great detail in the manual page for
 	  &man.ports.7;.</para>
       </sect3>
     </sect2>

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.954 2008/09/18 07:14:17 gabor Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.956 2008/10/23 15:58:52 des Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -12213,6 +12213,15 @@
 		      &man.suser.cred.9;.</entry>
 		    <entry>800049</entry>
 		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after buffer cache API change.</entry>
+		    <entry>800050</entry>
+		  </row>
+		  <row>
+		    <entry>8.0-CURRENT after the removal of the
+		    &man.MALLOC.9; and &man.FREE.9; macros.</entry>
+		    <entry>800051</entry>
+		  </row>
 		</tbody>
 	      </tgroup>
 	    </table>

==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#4 (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.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $ -->
+<!-- $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.38 2008/10/22 19:52:02 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.isp.xml,v 1.37 2008/10/18 16:55:21 erwin Exp $
+      $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.38 2008/10/22 19:52:02 jkois Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -861,6 +861,17 @@
     </description>
   </entry>
 
+  <entry id="kwshell">
+    <name>KwShell Internet Services</name>
+    <url>http://www.kwshell.com</url>;
+    <description>
+      KwShell Internet Services is an Arabic based company, which
+      provides hosting solutions like shared and dedicated Servers.
+      KwShell Internet Services is also able to provide management and
+      support for a variety of BSD and Linux systems.
+    </description>
+  </entry>
+
   <entry id="rootbsd">
     <name>RootBSD</name>
     <url>http://www.rootbsd.net</url>;

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#13 (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.202 2008/10/12 09:36:46 blackend Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.203 2008/10/23 08:48:05 danger Exp $
     </cvs:keyword>
   </cvs:keywords>
 
@@ -36,6 +36,18 @@
       <name>10</name>
 
       <day>
+	<name>19</name>
+	<event>
+	  <title>&os; 7.1-BETA2 Available</title>
+
+	  <p>The second beta release of &os; 7.1 is now <a
+	      href="http://lists.freebsd.org/pipermail/freebsd-stable/2008-October/046037.html">available</a>.
+	    ISO images for Tier-1 architectures can be found on most of the <a
+	      href="&url.doc.base-en;/books/handbook/mirrors-ftp.html">&os; mirror sites</a>.</p>
+	</event>
+      </day>
+
+      <day>
 	<name>12</name>
 
 	<event>

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

@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/share/sgml/release.ent,v 1.24 2008/10/12 08:59:54 danger Exp $ -->
+<!-- $FreeBSD: www/share/sgml/release.ent,v 1.25 2008/10/23 08:17:10 danger Exp $ -->
 
 <!-- XXX rel.current and u.rel.* should be available in doc/ -->
 <!-- The currently released versions of FreeBSD.  This value is used to
@@ -31,7 +31,7 @@
 <!ENTITY beta.testing "INCLUDE">
 <!ENTITY % beta.testing "INCLUDE">
 <!ENTITY betarel.current '7.1'>
-<!ENTITY betarel.vers 'BETA'>
+<!ENTITY betarel.vers 'BETA2'>
 <!ENTITY u.betarel.schedule '&base;/releases/&betarel.current;R/schedule.html'>
 
 <!-- If we have a second release in the release cycle (e.g. 5.x and 6.y



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