svn commit: r46469 - head/en_US.ISO8859-1/articles/cups

[Eitan Adler]

Author: eadler
Date: Sat Apr  4 23:31:59 2015
New Revision: 46469
URL: https://svnweb.freebsd.org/changeset/doc/46469

Log:
  cups: some changes
  
  - WITH_ and WITHOUT_ are outdated
  - make.conf is the wrong place for modern systems (which should be using
    poudriere)
  - only reference package installation.  Ports users can use the port name and
    the normal ports documentation

Modified:
  head/en_US.ISO8859-1/articles/cups/article.xml

Modified: head/en_US.ISO8859-1/articles/cups/article.xml
==============================================================================
--- head/en_US.ISO8859-1/articles/cups/article.xml	Sat Apr  4 22:50:15 2015	(r46468)
+++ head/en_US.ISO8859-1/articles/cups/article.xml	Sat Apr  4 23:31:59 2015	(r46469)
@@ -55,19 +55,12 @@
   <sect1 xml: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>
-
-    <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>
 
-    <screen>&prompt.root; <userinput>pkg_add -r cups</userinput></screen>
+    <screen>&prompt.root; <userinput>pkg install cups</userinput></screen>
 
-    <para>Other optional, but recommended, ports or packages are
+    <para>Other optional, but recommended, packages are
       <package>print/gutenprint-cups</package> and
       <package>print/hplip</package>, both of which add
       drivers and utilities for a variety of printers.  Once installed,
@@ -353,32 +346,5 @@ CUPS-Delete-Class CUPS-Accept-Jobs CUPS-
   </Limit>
 </Policy></programlisting>
   </sect1>
-
-  <sect1 xml: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 <quote>knobs</quote> that one may want to
-      add are:</para>
-
-    <programlisting>WITH_CUPS=YES
-CUPS_OVERWRITE_BASE=YES
-WITHOUT_LPR=YES</programlisting>
-
-    <para>The first knob, <varname>WITH_CUPS</varname>, adds
-      <application>CUPS</application> support to ports where applicable.
-      The second knob, <varname>CUPS_OVERWRITE_BASE</varname>, 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
-      <buildtarget>buildworld</buildtarget> system upgrade.  The third
-      knob, <varname>WITHOUT_LPR</varname>, will prevent
-      <application>LPR</application> support from being added to ports
-      where applicable.</para>
-  </sect1>
-
   <index/>
 </article>