On Wed, Jun 25, 2003 at 04:14:37PM -0700, G�zim Hoxha wrote:
> Now I have a few question:
> 1.) What does the number mean [at diff]?
> 2.) What do < and > mean ?
> 3.) What does the broken line mean ?
> 4.) How would I fix this cupsd.conf thing?
>
> Thank you,
>
> ZiM
Not sure if this is opinion or if everyone would agree, but if I
were you, I would do:
diff -u cupsd.conf ._cfg0000_cupsd.conf
which would produce output something like this:
--- cupsd.conf 2003-06-25 21:46:08.000000000 -0500
+++ ._cfg0000_cupsd.conf 2003-03-02 16:21:50.000000000 -0600
@@ -53,7 +53,7 @@
# By default CUPS will use "[EMAIL PROTECTED]".
#
-ServerAdmin [EMAIL PROTECTED]
+#ServerAdmin [EMAIL PROTECTED]
########
@@ -163,7 +163,7 @@
# none Log nothing.
#
-LogLevel debug2
+LogLevel info
#
# MaxLogSize: controls the maximum size of each log file before they are
@@ -474,7 +474,7 @@
#BrowseAddress x.255.255.255
#BrowseAddress 255.255.255.255
#BrowseAddress @LOCAL
-BrowseAddress @IF(eth0)
+#BrowseAddress @IF(name)
#
# BrowseShortNames: whether or not to use "short" names for remote printers
The numbers are again line numbers in the arg1 and arg2 versions
of the file (cupsd.conf and ._cfg0000_cupsd.conf), a line
starting with "-" is only in cupsd.conf, and a line starting with
"+" is only in ._cfg0000_cupsd.conf. If you pipe it to a file
whose name ends in ".diff" or ".patch", and open it in vim, it
will be colorized, for easy reading:
diff -u cupsd.conf ._cfg0000_cupsd.conf > cupsd.diff
vim cupsd.diff
- richard
--
Richard Kilgore
[EMAIL PROTECTED]
--
[EMAIL PROTECTED] mailing list
