PERFORCE change 169617 for review

Tue Oct 20 11:15:08 UTC 2009

http://p4web.freebsd.org/chv.cgi?CH=169617

Change 169617 by rene at rene_self on 2009/10/20 11:15:01

	IFC

Affected files ...

.. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#4 integrate
.. //depot/projects/docproj_nl/www/en/internal/Makefile#2 integrate
.. //depot/projects/docproj_nl/www/en/internal/i18n.sgml#1 branch
.. //depot/projects/docproj_nl/www/en/internal/policies.sgml#2 integrate
.. //depot/projects/docproj_nl/www/nl/administration.sgml#12 integrate

Differences ...

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

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.120 2008/08/03 19:57:51 manolis Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.121 2009/10/19 20:41:36 keramida Exp $
 -->
 
 <chapter id="printing">
@@ -4555,6 +4555,23 @@
 	    url="http://www.cups.org/"></ulink>.</para>
 	</listitem>
       </varlistentry>
+
+      <varlistentry>
+	<term>HPLIP</term>
+
+	<indexterm><primary>HPLIP</primary></indexterm>
+	<listitem>
+	  <para><application>HPLIP</application>, the HP &linux; Imaging and
+	    Printing system, is an HP-developed suite of programs that
+	    supports printing, scanning and fax facilities for HP appliances.
+	    This suite of programs utilizes
+	    the <application>CUPS</application> printing system as a backend
+	    for some of its printing features.</para>
+
+	  <para>The main site for <application>HPLIP</application>
+	    is <ulink url="http://hplipopensource.com/hplip-web/index.html"></ulink>.</para>
+	</listitem>
+      </varlistentry>
     </variablelist>
   </sect1>
 

==== //depot/projects/docproj_nl/www/en/internal/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/internal/Makefile,v 1.47 2007/02/18 12:40:45 simon Exp $
+# $FreeBSD: www/en/internal/Makefile,v 1.48 2009/10/19 07:26:46 murray Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -22,6 +22,7 @@
 DOCS+=	doceng.sgml
 DOCS+=	policies.sgml
 DOCS+=	fortunes.sgml
+DOCS+=	i18n.sgml
 
 INDEXLINK=	internal.html
 

==== //depot/projects/docproj_nl/www/en/internal/policies.sgml#2 (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/internal/policies.sgml,v 1.8 2006/08/19 21:20:36 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/en/internal/policies.sgml,v 1.9 2009/10/19 07:26:46 murray Exp $">
 <!ENTITY title "Policies for FreeBSD Committers">
 <!ENTITY % navinclude.docs "INCLUDE">
 ]>
@@ -38,6 +38,7 @@
 <a href="core-vote.html">Core's Voting Procedures</a>,
 the
 <a href="fortunes.html">Fortune File Policy</a>,
+<a href="i18n.html">Internationalization Policy</a>,
 and the
 <a href="../doc/en_US.ISO8859-1/articles/pr-guidelines/">Problem Report Handling Guidelines</a>.</p>
 

==== //depot/projects/docproj_nl/www/nl/administration.sgml#12 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.3 2009/10/11 09:46:35 rene Exp $">
+<!ENTITY date "$FreeBSD: www/nl/administration.sgml,v 1.4 2009/10/18 13:14:37 rene Exp $">
 <!ENTITY title "&os; Project Regelgeving en Beheer">
 <!ENTITY % navinclude.about "INCLUDE">
 <!ENTITY % developers SYSTEM "../en/developers.sgml"> %developers;
