httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/docs/manual LICENSE license.html.en license.xml
Date Sat, 07 Feb 2004 18:26:52 GMT
nd          2004/02/07 10:26:52

  Modified:    .        CHANGES LICENSE
               docs/manual LICENSE license.html.en license.xml
  Log:
  done with 2.1. Add missing appendix plus an appropriate CHANGES entry.
  
  Revision  Changes    Path
  1.1399    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1398
  retrieving revision 1.1399
  diff -u -u -r1.1398 -r1.1399
  --- CHANGES	5 Feb 2004 19:09:31 -0000	1.1398
  +++ CHANGES	7 Feb 2004 18:26:52 -0000	1.1399
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) The whole codebase was relicensed and is now available under
  +     the Apache License, Version 2.0 (http://www.apache.org/licenses).
  +     [Apache Software Foundation]
  +
     *) FreeBSD: Use the httpready accept filter instead of dataready on
        newer levels of the OS.  [Paul Querna <chip force-elite.com>]
   
  
  
  
  1.12      +26 -0     httpd-2.0/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/LICENSE,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -u -r1.11 -r1.12
  --- LICENSE	6 Feb 2004 21:59:34 -0000	1.11
  +++ LICENSE	7 Feb 2004 18:26:52 -0000	1.12
  @@ -175,6 +175,32 @@
   
      END OF TERMS AND CONDITIONS
   
  +   APPENDIX: How to apply the Apache License to your work.
  +
  +      To apply the Apache License to your work, attach the following
  +      boilerplate notice, with the fields enclosed by brackets "[]"
  +      replaced with your own identifying information. (Don't include
  +      the brackets!)  The text should be enclosed in the appropriate
  +      comment syntax for the file format. We also recommend that a
  +      file or class name and description of purpose be included on the
  +      same "printed page" as the copyright notice for easier
  +      identification within third-party archives.
  +
  +   Copyright [yyyy] [name of copyright owner]
  +
  +   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.
  +
  +
   
   APACHE HTTP SERVER SUBCOMPONENTS: 
   
  
  
  
  1.15      +26 -0     httpd-2.0/docs/manual/LICENSE
  
  Index: LICENSE
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/LICENSE,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -u -r1.14 -r1.15
  --- LICENSE	7 Feb 2004 17:26:09 -0000	1.14
  +++ LICENSE	7 Feb 2004 18:26:52 -0000	1.15
  @@ -174,3 +174,29 @@
         of your accepting any such warranty or additional liability.
   
      END OF TERMS AND CONDITIONS
  +
  +   APPENDIX: How to apply the Apache License to your work.
  +
  +      To apply the Apache License to your work, attach the following
  +      boilerplate notice, with the fields enclosed by brackets "[]"
  +      replaced with your own identifying information. (Don't include
  +      the brackets!)  The text should be enclosed in the appropriate
  +      comment syntax for the file format. We also recommend that a
  +      file or class name and description of purpose be included on the
  +      same "printed page" as the copyright notice for easier
  +      identification within third-party archives.
  +
  +   Copyright [yyyy] [name of copyright owner]
  +
  +   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.
  +
  
  
  
  1.9       +26 -0     httpd-2.0/docs/manual/license.html.en
  
  Index: license.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/license.html.en,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- license.html.en	7 Feb 2004 17:26:09 -0000	1.8
  +++ license.html.en	7 Feb 2004 18:26:52 -0000	1.9
  @@ -202,6 +202,32 @@
       </ol>
   
       <p class="centered">END OF TERMS AND CONDITIONS</p>
  +
  +    <p class="centered">APPENDIX: How to apply the Apache License to your
  +    work.</p>
  +
  +    <p>To apply the Apache License to your work, attach the following
  +    boilerplate notice, with the fields enclosed by brackets "[]"
  +    replaced with your own identifying information. (Don't include
  +    the brackets!)  The text should be enclosed in the appropriate
  +    comment syntax for the file format. We also recommend that a
  +    file or class name and description of purpose be included on the
  +    same "printed page" as the copyright notice for easier
  +    identification within third-party archives.</p>
  +
  +    <div class="example"><pre>Copyright [yyyy] [name of copyright owner]
  +
  +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<br />
  +
  +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.</pre></div>
   </div>
   </div>
   <div class="bottomlang">
  
  
  
  1.6       +28 -0     httpd-2.0/docs/manual/license.xml
  
  Index: license.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/license.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -u -r1.5 -r1.6
  --- license.xml	7 Feb 2004 17:26:09 -0000	1.5
  +++ license.xml	7 Feb 2004 18:26:52 -0000	1.6
  @@ -205,6 +205,34 @@
       </ol>
   
       <p class="centered">END OF TERMS AND CONDITIONS</p>
  +
  +    <p class="centered">APPENDIX: How to apply the Apache License to your
  +    work.</p>
  +
  +    <p>To apply the Apache License to your work, attach the following
  +    boilerplate notice, with the fields enclosed by brackets "[]"
  +    replaced with your own identifying information. (Don't include
  +    the brackets!)  The text should be enclosed in the appropriate
  +    comment syntax for the file format. We also recommend that a
  +    file or class name and description of purpose be included on the
  +    same "printed page" as the copyright notice for easier
  +    identification within third-party archives.</p>
  +
  +    <example>
  +      <pre>Copyright [yyyy] [name of copyright owner]
  +
  +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.</pre>
  +    </example>
   </summary>
   </manualpage>
   
  
  
  

Mime
View raw message