remove invalid <license/> tag, and update legal.xml to cc by-sa

24 files changed, 11 insertions, 123 deletions

diff --git a/help/C/add-account.page b/help/C/add-account.page
index 5dea2c79f..3d18b94a0 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -17,8 +17,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index 003101804..529ec07da 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -17,8 +17,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/change-status.page b/help/C/change-status.page
index e9204457a..e2b473144 100644
--- a/help/C/change-status.page
+++ b/help/C/change-status.page
@@ -19,8 +19,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/create-account.page b/help/C/create-account.page
index d57f5cca1..01971e92c 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -20,10 +20,7 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"
-    />
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
   <comment>
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
index 2c695182d..aafd3a513 100644
--- a/help/C/disable-account.page
+++ b/help/C/disable-account.page
@@ -18,8 +18,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/index.page b/help/C/index.page
index 340fe95e2..8dd103b53 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -15,8 +15,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
index b0d6cd2d9..3b58c96d5 100644
--- a/help/C/irc-account.page
+++ b/help/C/irc-account.page
@@ -18,8 +18,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
index 3dcd95d14..7d1d8dd6d 100644
--- a/help/C/irc-join-pwd.page
+++ b/help/C/irc-join-pwd.page
@@ -17,8 +17,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
index e6dc99177..17fbf8e72 100644
--- a/help/C/irc-join-room.page
+++ b/help/C/irc-join-room.page
@@ -16,8 +16,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
index ff6dae272..b80c38cda 100644
--- a/help/C/irc-manage.page
+++ b/help/C/irc-manage.page
@@ -16,8 +16,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
index 998203a89..bc7e565e3 100644
--- a/help/C/irc-nick-password.page
+++ b/help/C/irc-nick-password.page
@@ -17,8 +17,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1de4..6f643bec5 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,76 +1,9 @@
-  <legalnotice id="legalnotice">
-	<para>
-	  Permission is granted to copy, distribute and/or modify this
-	  document under the terms of the GNU Free Documentation
-	  License (GFDL), Version 1.1 or any later version published
-	  by the Free Software Foundation with no Invariant Sections,
-	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
-	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
-	  distributed with this manual.
-         </para>
-         <para> This manual is part of a collection of GNOME manuals
-          distributed under the GFDL.  If you want to distribute this
-          manual separately from the collection, you can do so by
-          adding a copy of the license to the manual, as described in
-          section 6 of the license.
-	</para>
-
-	<para>
-	  Many of the names used by companies to distinguish their
-	  products and services are claimed as trademarks. Where those
-	  names appear in any GNOME documentation, and the members of
-	  the GNOME Documentation Project are made aware of those
-	  trademarks, then the names are in capital letters or initial
-	  capital letters.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-
-	  <orderedlist>
-		<listitem>
-		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
-                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
-                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
-                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
-                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
-                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
-                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
-                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
-                    EXCEPT UNDER THIS DISCLAIMER; AND
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
-                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
-                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
-                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
-                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
-                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
-                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
-                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
-                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
-                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-                       THE POSSIBILITY OF SUCH DAMAGES.
-		  </para>
-		</listitem>
-	  </orderedlist>
-	</para>
-  </legalnotice>
-
+<license xmlns="http://projectmallard.org/1.0/"
+         href="http://creativecommons.org/licenses/by-sa/3.0/us/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons
+Attribution-Share Alike 3.0 United States License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
index 2a8bea8ee..7cb014d08 100644
--- a/help/C/offline-contacts.page
+++ b/help/C/offline-contacts.page
@@ -19,8 +19,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
index 5c8a07f47..efae37229 100644
--- a/help/C/prob-conn-acctdisabled.page
+++ b/help/C/prob-conn-acctdisabled.page
@@ -17,7 +17,6 @@
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
-    <license>Creative Commons Share Alike 3.0</license>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index be0ec4389..e47f48a82 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -23,8 +23,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 3196da8a8..c475b0253 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -18,7 +18,6 @@
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
-    <license>Creative Commons Share Alike 3.0</license>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index cb7dcb049..5455e19a8 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -18,7 +18,6 @@
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
-    <license>Creative Commons Share Alike 3.0</license>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
index b4397b792..2bc4ab16e 100644
--- a/help/C/prob-conn.page
+++ b/help/C/prob-conn.page
@@ -18,8 +18,6 @@
     <name>GNOME Documentation Project</name>
   </copyright>
 
-  <license>Creative Commons Share Alike 3.0</license>
-
   <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
 </info>
 
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
index f0825436d..355d4955d 100644
--- a/help/C/remove-account.page
+++ b/help/C/remove-account.page
@@ -16,10 +16,7 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"
-      />
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
   <comment>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
index 335a21b3e..ddaac93ab 100644
--- a/help/C/salut-protocol.page
+++ b/help/C/salut-protocol.page
@@ -18,8 +18,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
   
diff --git a/help/C/send-file.page b/help/C/send-file.page
index e0da892e4..0768696bf 100644
--- a/help/C/send-file.page
+++ b/help/C/send-file.page
@@ -21,8 +21,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/send-message.page b/help/C/send-message.page
index 833e484c2..801483004 100644
--- a/help/C/send-message.page
+++ b/help/C/send-message.page
@@ -16,8 +16,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
   
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
index cf4fcc098..04e49e4ab 100644
--- a/help/C/set-custom-status.page
+++ b/help/C/set-custom-status.page
@@ -20,8 +20,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
     
-    <license>Creative Commons Share Alike 3.0</license>
-    
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>
 
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
index 118af1957..d8dccdfb0 100644
--- a/help/C/status-icons.page
+++ b/help/C/status-icons.page
@@ -18,8 +18,6 @@
       <name>GNOME Documentation Project</name>
     </copyright>
 
-    <license>Creative Commons Share Alike 3.0</license>
-
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
   </info>