[empathy: 41/55] remove invalid <license/> tag, and update legal.xml to cc by-sa
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy: 41/55] remove invalid <license/> tag, and update legal.xml to cc by-sa
- Date: Wed, 12 Aug 2009 16:47:58 +0000 (UTC)
commit a984f5c1916a33edf8145491e57aa3faa08865fd
Author: Frédéric Péters <fpeters 0d be>
Date: Mon Aug 10 13:56:47 2009 +0200
remove invalid <license/> tag, and update legal.xml to cc by-sa
help/C/add-account.page | 2 -
help/C/add-contact.page | 2 -
help/C/change-status.page | 2 -
help/C/create-account.page | 5 +--
help/C/disable-account.page | 2 -
help/C/index.page | 2 -
help/C/irc-account.page | 2 -
help/C/irc-join-pwd.page | 2 -
help/C/irc-join-room.page | 2 -
help/C/irc-manage.page | 2 -
help/C/irc-nick-password.page | 2 -
help/C/legal.xml | 85 ++++--------------------------------
help/C/offline-contacts.page | 2 -
help/C/prob-conn-acctdisabled.page | 1 -
help/C/prob-conn-auth.page | 2 -
help/C/prob-conn-name.page | 1 -
help/C/prob-conn-neterror.page | 1 -
help/C/prob-conn.page | 2 -
help/C/remove-account.page | 5 +--
help/C/salut-protocol.page | 2 -
help/C/send-file.page | 2 -
help/C/send-message.page | 2 -
help/C/set-custom-status.page | 2 -
help/C/status-icons.page | 2 -
24 files changed, 11 insertions(+), 123 deletions(-)
---
diff --git a/help/C/add-account.page b/help/C/add-account.page
index 5dea2c7..3d18b94 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 0031018..529ec07 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 e920445..e2b4731 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 d57f5cc..01971e9 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 2c69518..aafd3a5 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 340fe95..8dd103b 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 b0d6cd2..3b58c96 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 3dcd95d..7d1d8dd 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 e6dc991..17fbf8e 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 ff6dae2..b80c38c 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 998203a..bc7e565 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 ac97e1d..6f643be 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 2a8bea8..7cb014d 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 5c8a07f..efae372 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 be0ec43..e47f48a 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 3196da8..c475b02 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 cb7dcb0..5455e19 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 b4397b7..2bc4ab1 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 f082543..355d495 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 335a21b..ddaac93 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 e0da892..0768696 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 833e484..8014830 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 cf4fcc0..04e49e4 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 118af19..d8dccdf 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
