Stas Bekman wrote:
Philippe M. Chiasson wrote:
Stas Bekman wrote:
Philippe, haven't we updated the API docs to ASFL 2?
Nope, we agreed to only relicence the code first.
Right and we have mp1 to handle too.
Yup, that's another thing to take care before the next 1.x release
I guess not, since all pages still say 1.1. Can you run your script again on the docs.
Sure, but one queston, which is the prefered kind of relicence patch:
Index: Apache.pod =================================================================== RCS file: /home/cvs/modperl-docs/src/docs/2.0/api/Apache.pod,v retrieving revision 1.3 diff -u -I$Id -r1.3 Apache.pod --- Apache.pod 23 Mar 2004 14:55:40 -0000 1.3 +++ Apache.pod 22 May 2004 01:17:09 -0000 @@ -53,7 +53,7 @@ =head1 Copyright
mod_perl 2.0 and its core modules are copyrighted under -The Apache Software License, Version 1.1. +The Apache Software License, Version 2.0.
Or the more complete one with the recommended 'boilerplate'
diff -u -I$Id -r1.3 APR.pod --- APR.pod 13 Jan 2004 02:51:49 -0000 1.3 +++ APR.pod 22 May 2004 01:17:41 -0000 @@ -28,7 +28,22 @@ =head1 Copyright
mod_perl 2.0 and its core modules are copyrighted under
-The Apache Software License, Version 1.1.
+The Apache Software License, Version 2.0.
+
+Copyright [yyyy] The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
I prefer the former short one (s/1.1/2.0/. This is a doc, not the code, it just references what the license the code is licensed under. Those interested in using code will find the rest when they look at the code. Besides we don't need extra clutter in docs which are viewable by users.
But please sync with me before you do that. I have lots of updates for the docs and new manpages, which I can't commit now and will do that once Geoff releases 1.99_14.
Sure thing,
Any time when you are ready. Now that Geoff has released 1.99_14 I'm committing things right away, so no problem whatsoever.
Done.
Thanks Philippe!
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
