Right. It was named license-1.html in order to be a "forever" URL. It
is (now) part of the historical record.
IOW, update the discussion block at the top to point to the new
license, and leave the license portion intact.
Cheers,
-g
On Wed, Jul 8, 2009 at 23:52, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
>
> Karl Fogel wrote on Wed, 8 Jul 2009 at 00:43 -0400:
> > There's also the www/license-1.html, which I would just update (see
> > patch below), except that calling it "license-1.html" is a bit
> > confusing now, since this is v2 of the Apache License, so perhaps we
> > ought to just call it "license.html" and have a redirect from the old
> > file.
> >
>
> I don't think we can remove the old license from http://.../license-1.html
> (isn't that the entire point of embedding a version number in that
> filename?).
>
> > Finally, shouldn't collectively-maintained python scripts in
> > tools/dev/ (such as check-license.py itself!) get the header too?
> >
>
> And I guess some docs should be updated, too. (e.g.,
> http://subversion.tigris.org/design.html#license, and the page
> in the book that says what license svn is under, etc.)
>
> Daniel
>
> > -Karl
> >
> > [[[
> > * www/license-1.html: Update for r38370.
> > ]]]
> >
> > Index: license-1.html
> > ===================================================================
> > --- license-1.html (revision 38370)
> > +++ license-1.html (working copy)
> > @@ -23,53 +23,207 @@
> > their terms may differ from the terms below.</p>
> >
> > <pre>
> > -/* ================================================================
> > - * Copyright (c) 2000-2009 CollabNet. All rights reserved.
> > - *
> > - * Redistribution and use in source and binary forms, with or without
> > - * modification, are permitted provided that the following conditions
> > - * are met:
> > + Apache License
> > + Version 2.0, January 2004
> > + http://www.apache.org/licenses/
> > +
> > + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
> > +
> > + 1. Definitions.
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2369156
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2369245
Received on 2009-07-09 07:32:20 CEST