[gedit-plugins] Make the help licence install correctly
- From: Ekaterina Gerasimova <egerasimov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit-plugins] Make the help licence install correctly
- Date: Sun, 19 May 2013 11:57:01 +0000 (UTC)
commit 912906c833cd2de81130eb1973169c16ccf2757d
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date: Sun May 19 12:38:47 2013 +0100
Make the help licence install correctly
Because gedit has a legal.xml, gedit-plugins cannot have a licence file
with the same name. Therefore, to avoid clashes between the two,
gedit-plugins should use legal-plugins.xml for its licence and once
installed, it should be displayed correctly.
help/C/legal-plugins.xml | 11 +++++++++++
help/C/legal.xml | 5 -----
help/C/tag-list.page | 2 +-
help/C/terminal.page | 2 +-
help/C/text-size.page | 2 +-
help/C/word-completion.page | 2 +-
help/Makefile.am | 1 +
7 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/help/C/legal-plugins.xml b/help/C/legal-plugins.xml
new file mode 100644
index 0000000..68e3a0f
--- /dev/null
+++ b/help/C/legal-plugins.xml
@@ -0,0 +1,11 @@
+<license xmlns="http://projectmallard.org/1.0/">
+
+ <!-- This is the licence file for plubins which come from gedit-plugins. -->
+
+ <p>This work is licensed under the Creative Commons Attribution-ShareAlike
+ 3.0 Unported License. To view a copy of this license, visit
+ <link
xref="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>
+ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain
+ View, California, 94041, USA.</p>
+
+</license>
diff --git a/help/C/tag-list.page b/help/C/tag-list.page
index ddfcd09..73241a8 100644
--- a/help/C/tag-list.page
+++ b/help/C/tag-list.page
@@ -21,7 +21,7 @@
<email its:translate="no">sindhus live in</email>
</credit>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="legal-plugins.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Automatically insert tags, strings and special characters into a documenti.</desc>
</info>
diff --git a/help/C/terminal.page b/help/C/terminal.page
index 50904d3..778fd14 100644
--- a/help/C/terminal.page
+++ b/help/C/terminal.page
@@ -17,7 +17,7 @@
<email its:translate="no">sindhus live in</email>
</credit>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="legal-plugins.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Add a terminal console to the bottom pane.</desc>
</info>
diff --git a/help/C/text-size.page b/help/C/text-size.page
index f160e9e..a66fc70 100644
--- a/help/C/text-size.page
+++ b/help/C/text-size.page
@@ -17,7 +17,7 @@
<email its:translate="no">sindhus live in</email>
</credit>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="legal-plugins.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Increase or decrease text size.</desc>
</info>
diff --git a/help/C/word-completion.page b/help/C/word-completion.page
index 8f7bc7a..aa9d067 100644
--- a/help/C/word-completion.page
+++ b/help/C/word-completion.page
@@ -20,7 +20,7 @@
<email its:translate="no">sindhus live in</email>
</credit>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="legal-plugins.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>Autocomplete words or portions of code as you type.</desc>
</info>
diff --git a/help/Makefile.am b/help/Makefile.am
index 8f4cecd..dc38cf5 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -13,6 +13,7 @@ HELP_FILES = \
dashboard.page \
draw-spaces.page \
join-split-lines.page \
+ legal-plugins.xml \
multi-edit.page \
session-saver.page \
tag-list.page \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]