Should I do that diff then?

On 1/29/06, Jasper Lievisse Adriaanse <[EMAIL PROTECTED]> wrote:
> On Sun, 29 Jan 2006 12:35:56 -0300
> AndrC)s Delfino <[EMAIL PROTECTED]> wrote:
>
> > Or... somehow I changed that word when sending the message. Anyway,
> > this is the correct diff:
> >
> > --- license.template    Tue Jun  3 19:37:00 2003
> > +++ license.template.1  Sun Jan 29 12:33:55 2006
> > @@ -5,11 +5,14 @@
> >  should be separated by a comma, e.g.
> >      Copyright (c) 2003, 2004
> >
> > +Note that less than and greater than signs below must be removed;
> > +they are there for you to enter your own information.
> > +
> >  If you add extra text to the body of the license, be careful not to
> >  add further restrictions.
> >
> >  /*
> > - * Copyright (c) CCYY YOUR NAME HERE <[EMAIL PROTECTED]>
> > + * Copyright (c) <YEAR> <YOUR NAME> <YOUR E-MAIL>
> >   *
> >   * Permission to use, copy, modify, and distribute this software for any
> >   * purpose with or without fee is hereby granted, provided that the above
>
> Could you please quote under the message?
>
> anyway, it's much easer to use the "cvs diff" command it you're diffing
> against files that are in a repository.
>
> >
> > On 1/29/06, Jasper Lievisse Adriaanse <[EMAIL PROTECTED]> wrote:
> > > On Sun, 29 Jan 2006 07:17:23 -0800
> > > AndrC)s Delfino <[EMAIL PROTECTED]> wrote:
> > >
> > > > yes, I haven't that typo in the original file, sorry, :P
> > > Well, how come it didn't show up the diff?
> > > You didn't diff against the original then.
> > >
> > > >
> > > > On 1/29/06, Joachim Schipper <[EMAIL PROTECTED]> wrote:
> > > > > On Sun, Jan 29, 2006 at 10:12:28AM -0300, Andris Delfino wrote:
> > > > > > Maybe it may help someone, :P
> > > > > >
> > > > > > --- license.template       Tue Jun  3 19:37:00 2003
> > > > > > +++ license.template.1  Sun Jan 29 10:00:22 2006
> > > > > > @@ -5,11 +5,14 @@
> > > > > >  should be separated by a comma, e.g.
> > > > > >      Copyright (c) 2003, 2004
> > > > > >
> > > > > > +Note that less than and greater than signs below MUST be removed;
> > > > > > +they are there for you to enter your own information.
> > > > > > +
> > > > > >  If you add extra text to the body of the license, be careful not to
> > > > > >  add further restrictions.
> > > > > >
> > > > > >  /*
> > > > > > - * Copyright (c) CCYY YOUR NAME HERE <[EMAIL PROTECTED]>
> > > > > > + * Copyright (c) <YEAR> <YOUR NAME HERE> <YOUR E-MAIL HERE>
> > > > > >   *
> > > > > >   * Permission to use, copy, modify, and distribute this softwae 
> > > > > > for any
> > > > >                                                                 ^^
> > > > > This typo is not there on my system (3.8-stable); I hope you added it
> > > > > somehow?
> > > > >
> > > > >             Joachim
> > > >
> > >
> > >
> > > --
> > > "Security is decided by quality" -- Theo de Raadt
> > >
> > >
> > >
>
>
> --
> "Security is decided by quality" -- Theo de Raadt

Reply via email to