On Wed, Jun 25, 2003 at 04:14:37PM -0700, G?zim Hoxha wrote: > [snip] > I did that and the output was this: > root# > 56c56 > < ServerAdmin [EMAIL PROTECTED] > --- > > #ServerAdmin [EMAIL PROTECTED] > 166c166 > < LogLevel debug2 > --- > > LogLevel info > 477c477 > < BrowseAddress @IF(eth0) > --- > > #BrowseAddress @IF(name) > root# > > Now I have a few question: > 1.) What does the number mean [at diff]?
The numbers indicates the point at which where the two files diverge. So the first one (56c56) indicates that line 56 in each file differs. NOTE: the 'c' indicates a change, there are other letters for different types of changes. You should take a look at the diff man page for details > 2.) What do < and > mean ? Assuming you're doing # diff FILE-A FILE-B '<' indicates the contents of FILE-A '>' indicates the contents of FILE-B note: when running etc-update, the diff it shows you is FILE-A is the original (your version), FILE-B is the update (which you downloaded when you emerged). > 3.) What does the broken line mean ? By this I assume you mean the "---". This is just a separator between the two versions of the changed part of the file. > 4.) How would I fix this cupsd.conf thing? > In this particular case, it looks like there aren't any important changes (unless you want to change the LogLevel setting), so you could just delete the change. This should be in the list of choices etc-update gives you. - PK > Thank you, > > ZiM > > __________________________________ > Do you Yahoo!? > SBC Yahoo! DSL - Now only $29.95 per month! > http://sbc.yahoo.com > > -- > [EMAIL PROTECTED] mailing list -- [EMAIL PROTECTED] mailing list
