[SCM] Samba Website Repository - branch master updated

[Lars Müller]

The branch, master has been updated
       via  1d9f9f4 Indention and url cleanup
      from  b4789d9 Update copyright policy as discussed on list

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d9f9f42bf34700bc72ae2255cd7e9486bad0a5f
Author: Lars Müller <lars at samba.org>
Date:   Wed Jan 11 23:34:48 2012 +0100

    Indention and url cleanup

-----------------------------------------------------------------------

Summary of changes:
 devel/copyright-policy.html |   44 +++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 24 deletions(-)


Changeset truncated at 500 lines:

diff --git a/devel/copyright-policy.html b/devel/copyright-policy.html
index a1d2962..c513282 100644
--- a/devel/copyright-policy.html
+++ b/devel/copyright-policy.html
@@ -40,8 +40,8 @@ We use a process very similar to the way things are done in the Linux
 kernel community, so it should be very easy to get a sign off from
 your corporate legal department. The only changes we've made are to
 accommodate the licenses we use, which are
-<a href="http://www.gnu.org/licenses/gpl-3.0">GPLv3</a> and
-<a href="http://www.gnu.org/licenses/lgpl-3.0">LGPLv3</a> (or later)
+<a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3</a> and
+<a href="http://www.gnu.org/licenses/lgpl-3.0.html">LGPLv3</a> (or later)
 whereas the Linux kernel uses
 <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPLv2</a>.
 </p>
@@ -69,30 +69,26 @@ By making a contribution to this project, I certify that:
     have the right to submit it under the appropriate
     version of the GNU General Public License; or
 
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the GNU General Public License, in the
-    appropriate version; or
+(b) The contribution is based upon previous work that, to the best of
+    my knowledge, is covered under an appropriate open source license
+    and I have the right under that license to submit that work with
+    modifications, whether created in whole or in part by me, under
+    the GNU General Public License, in the appropriate version; or
 
 (c) The contribution was provided directly to me by some other
-    person who certified (a) or (b) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the
-    contribution are public and that a record of the
-    contribution (including all metadata and personal
-    information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed
-    consistent with the Samba Team's policies and the
-    requirements of the GNU GPL where they are relevant.
-
-(e) I am granting this work to this project under the terms of both
-    the GNU General Public License and the GNU Lesser General Public
-    License as published by the Free Software Foundation; either version
-    3 of these Licenses, or (at the option of the project) any later
-    version.
+    person who certified (a) or (b) and I have not modified it.
+
+(d) I understand and agree that this project and the contribution are
+    public and that a record of the contribution (including all
+    metadata and personal information I submit with it, including my
+    sign-off) is maintained indefinitely and may be redistributed
+    consistent with the Samba Team's policies and the requirements of
+    the GNU GPL where they are relevant.
+
+(e) I am granting this work to this project under the terms of both the
+    GNU General Public License and the GNU Lesser General Public License
+    as published by the Free Software Foundation; either version 3 of
+    these Licenses, or (at the option of the project) any later version.
 
     http://www.gnu.org/licenses/gpl-3.0.html
     http://www.gnu.org/licenses/lgpl-3.0.html


-- 
Samba Website Repository