[gnome-getting-started-docs] Add gs-legal.xml
- From: Petr Kovář <pmkovar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-getting-started-docs] Add gs-legal.xml
- Date: Mon, 18 Mar 2013 23:28:39 +0000 (UTC)
commit f7c235c499042179e1289bf485541baad6677e5b
Author: Petr Kovar <pkovar redhat com>
Date: Tue Mar 19 00:25:37 2013 +0100
Add gs-legal.xml
This is to avoid a name conflict with gnome-help at install time.
.gitignore | 1 +
gnome-help/C/browse-web.page | 2 +-
gnome-help/C/change-time.page | 2 +-
gnome-help/C/change-wallpaper.page | 2 +-
gnome-help/C/getting-started.page | 2 +-
gnome-help/C/gs-legal.xml | 5 +++++
gnome-help/C/install-software.page.stub | 2 +-
gnome-help/C/launch-apps.page | 2 +-
gnome-help/C/move-windows.page | 2 +-
gnome-help/C/online-accounts.page | 2 +-
gnome-help/C/online.page | 2 +-
gnome-help/C/responding-to-messages.page | 2 +-
gnome-help/C/switching-tasks.page | 2 +-
gnome-help/C/use-search.page | 2 +-
gnome-help/Makefile.am | 1 +
15 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f3cd905..e4db7c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,5 +24,6 @@ Makefile.in
/gnome-doc-utils.make
/gnome-help/??*/*.page
/gnome-help/??*/*.svg
+/gnome-help/??*/gs-legal.xml
/gnome-help/??*/legal.xml
/gnome-help/??*/animation.xml
diff --git a/gnome-help/C/browse-web.page b/gnome-help/C/browse-web.page
index 70ec339..2612ba3 100644
--- a/gnome-help/C/browse-web.page
+++ b/gnome-help/C/browse-web.page
@@ -5,7 +5,7 @@
id="browse-web">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/change-time.page b/gnome-help/C/change-time.page
index 3bf195c..f3040d9 100644
--- a/gnome-help/C/change-time.page
+++ b/gnome-help/C/change-time.page
@@ -5,7 +5,7 @@
id="change-time">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/change-wallpaper.page b/gnome-help/C/change-wallpaper.page
index 1f5c3c8..a2aa5d6 100644
--- a/gnome-help/C/change-wallpaper.page
+++ b/gnome-help/C/change-wallpaper.page
@@ -5,7 +5,7 @@
id="change-wallpaper">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/getting-started.page b/gnome-help/C/getting-started.page
index 24ca229..5e48488 100644
--- a/gnome-help/C/getting-started.page
+++ b/gnome-help/C/getting-started.page
@@ -5,7 +5,7 @@
<info>
<link type="guide" xref="index" group="#first"/>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<desc>New to GNOME? Learn how to get around.</desc>
<title type='link'>Getting Started with GNOME</title>
<title type='text'>Getting Started</title>
diff --git a/gnome-help/C/gs-legal.xml b/gnome-help/C/gs-legal.xml
new file mode 100644
index 0000000..cb5d83f
--- /dev/null
+++ b/gnome-help/C/gs-legal.xml
@@ -0,0 +1,5 @@
+<license xmlns="http://projectmallard.org/1.0/"
+ href="http://creativecommons.org/licenses/by-sa/3.0/">
+ <p>This work is licensed under a <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative
+ Commons Attribution-ShareAlike 3.0 Unported License</link>.</p>
+</license>
diff --git a/gnome-help/C/install-software.page.stub b/gnome-help/C/install-software.page.stub
index cbdd33b..1d019cc 100644
--- a/gnome-help/C/install-software.page.stub
+++ b/gnome-help/C/install-software.page.stub
@@ -4,7 +4,7 @@
id="install-software">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<link type="guide" xref="getting-started" group="tasks"/>
<title role="trail" type="link">Get additional applications</title>
</info>
diff --git a/gnome-help/C/launch-apps.page b/gnome-help/C/launch-apps.page
index 17f4126..f20dce7 100644
--- a/gnome-help/C/launch-apps.page
+++ b/gnome-help/C/launch-apps.page
@@ -5,7 +5,7 @@
id="launch-apps">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/move-windows.page b/gnome-help/C/move-windows.page
index 76d1d75..bb8efd0 100644
--- a/gnome-help/C/move-windows.page
+++ b/gnome-help/C/move-windows.page
@@ -4,7 +4,7 @@
id="move-windows">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/online-accounts.page b/gnome-help/C/online-accounts.page
index 82c7042..b63965a 100644
--- a/gnome-help/C/online-accounts.page
+++ b/gnome-help/C/online-accounts.page
@@ -4,7 +4,7 @@
id="online-accounts">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/online.page b/gnome-help/C/online.page
index b919fd3..890cf46 100644
--- a/gnome-help/C/online.page
+++ b/gnome-help/C/online.page
@@ -4,7 +4,7 @@
id="online">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/responding-to-messages.page b/gnome-help/C/responding-to-messages.page
index 99a5054..8346a15 100644
--- a/gnome-help/C/responding-to-messages.page
+++ b/gnome-help/C/responding-to-messages.page
@@ -5,7 +5,7 @@
id="respond-to-messages">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/switching-tasks.page b/gnome-help/C/switching-tasks.page
index 65b2266..186e03a 100644
--- a/gnome-help/C/switching-tasks.page
+++ b/gnome-help/C/switching-tasks.page
@@ -4,7 +4,7 @@
id="switch-tasks">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/C/use-search.page b/gnome-help/C/use-search.page
index f962521..6bbec71 100644
--- a/gnome-help/C/use-search.page
+++ b/gnome-help/C/use-search.page
@@ -4,7 +4,7 @@
id="use-search">
<info>
- <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+ <include href="gs-legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
<credit type="author">
<name>Jakub Steiner</name>
</credit>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index dd4ef43..0c86634 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -27,6 +27,7 @@ HELP_FILES = \
go-online1.svg \
go-online2.svg \
go-online3.svg \
+ gs-legal.xml \
launch-apps.page \
move-windows.page \
online-accounts.page \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]