Merge changes from CUPS 1.7svn-r10643

[thirdparty/cups.git] / doc / help / network.html

diff --git a/doc/help/network.html b/doc/help/network.html
index ebe1b5f94c3d3ab232faae8d5307d94727a3ceae..ef9fbefbebdaf2878ebe54001d1cb2975cad1d66 100644 (file)
--- a/doc/help/network.html
+++ b/doc/help/network.html
@@ -38,13 +38,7 @@ host <I>hostname</I> {
 
 <H3><A NAME="BOOTP">Configuring the IP Address Using BOOTP</A></H3>
 
-<P>The BOOTP protocol is used when you need to provide additional information such as the location of a configuration file to the network interface. Using the standard <TT>bootpd(8)</TT> program supplied with UNIX you simply need to add a line to the <VAR>/etc/bootptab</VAR> file; for IRIX:</P>
-
-<PRE CLASS="command">
-myprinter 08:00:69:00:12:34 192.0.2.2 <VAR>myprinter.boot</VAR>
-</PRE>
-
-<P>Newer versions of <TT>bootpd</TT> use a different format:</P>
+<P>The BOOTP protocol is used when you need to provide additional information such as the location of a configuration file to the network interface. Using the standard <TT>bootpd(8)</TT> program supplied with UNIX you simply need to add a line to the <VAR>/etc/bootptab</VAR> file:</P>
 
 <PRE CLASS="command">
 myprinter:ha=080069001234:ip=192.0.2.2:<VAR>t144=myprinter.boot</VAR>