[gnome-terminal/wip/mallard-merge: 265/271] help: add license information



commit 9df59be0456618ba91035e3bcc3ef3a3eac862c3
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Sun Mar 3 13:39:00 2013 +0000

    help: add license information
    
    Fix validation error in legal.xml and add license <include> to every
    file.
    
    Mike Hill <mdhillca gmail com> and Jim Campbell <jwcampbell gmail com>
    agreed on 2013-03-02, and Sindhu S <sindhus live in> on 2013-02-24, to
    have the work on user help dual-licensed under CC-by-SA 3.0 and GPL 3.

 help/C/adv-custom-colors.page.stub            |    2 ++
 help/C/adv-keyboard-shortcuts.page            |    2 ++
 help/C/app-colors.page                        |    6 ++++--
 help/C/app-cursor.page                        |    4 +++-
 help/C/app-fonts.page                         |    4 +++-
 help/C/app-fullscreen.page                    |    2 ++
 help/C/app-terminal-sizes.page                |    6 ++++--
 help/C/app-zoom.page                          |    4 +++-
 help/C/gs-execute-commands.page               |    2 ++
 help/C/gs-tabs.page                           |    2 ++
 help/C/index.page                             |    2 ++
 help/C/introduction.page                      |    2 ++
 help/C/legal.xml                              |    4 +---
 help/C/overview.page                          |    2 ++
 help/C/pref-bell.page                         |    4 +++-
 help/C/pref-compatibility.page.stub           |    2 ++
 help/C/pref-custom-exit.page                  |    6 ++++--
 help/C/pref-custom-shells.page                |    6 ++++--
 help/C/pref-keyboard-access.page              |    2 ++
 help/C/pref-login-shell.page                  |    2 ++
 help/C/pref-menubar.page                      |    8 +++++---
 help/C/pref-profiles.page                     |    2 ++
 help/C/pref-reset.page                        |    2 ++
 help/C/pref-scrolling.page                    |    2 ++
 help/C/pref-title.page                        |    7 ++++---
 help/C/prob-add-to-path.page.stub             |    2 ++
 help/C/prob-recover-default-profile.page.stub |    4 +++-
 help/C/txt-copy-paste.page                    |    2 ++
 help/C/txt-links.page                         |    2 ++
 help/C/txt-save-text.page                     |    4 +++-
 help/C/txt-search.page                        |    4 +++-
 help/C/txt-select-text.page                   |    6 ++++--
 32 files changed, 85 insertions(+), 26 deletions(-)
---
diff --git a/help/C/adv-custom-colors.page.stub b/help/C/adv-custom-colors.page.stub
index 88df17a..c1a86d7 100644
--- a/help/C/adv-custom-colors.page.stub
+++ b/help/C/adv-custom-colors.page.stub
@@ -12,6 +12,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Set custom color schemes.</desc>
   </info>
 
diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index f99a4fe..3de3f7f 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -24,6 +24,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>View and edit keyboard shortcuts.</desc>
   </info>
 
diff --git a/help/C/app-colors.page b/help/C/app-colors.page
index f5a9223..7935b7d 100644
--- a/help/C/app-colors.page
+++ b/help/C/app-colors.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic"
       id="app-colors">
+
   <info>
     <revision version="0.1" date="2013-03-02" status="candidate"/>
+    <link type="guide" xref="index#appearence"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#appearence"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Change colors and backgrounds.</desc>
 
@@ -131,4 +133,4 @@
 
   </section>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/help/C/app-cursor.page b/help/C/app-cursor.page
index 15e259c..d38457c 100644
--- a/help/C/app-cursor.page
+++ b/help/C/app-cursor.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="app-cursor">
+
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
+    <link type="guide" xref="index#appearence"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#appearence"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Select different cursor style</desc>
 
diff --git a/help/C/app-fonts.page b/help/C/app-fonts.page
index e5ec1c2..90325da 100644
--- a/help/C/app-fonts.page
+++ b/help/C/app-fonts.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="app-fonts">
+
   <info>
     <revision version="0.1" date="2013-02-22" status="candidate"/>
+    <link type="guide" xref="index#appearence"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#appearence"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Use system fonts or choose a custom font for your terminal.</desc>
 
diff --git a/help/C/app-fullscreen.page b/help/C/app-fullscreen.page
index 681d6d9..b495899 100644
--- a/help/C/app-fullscreen.page
+++ b/help/C/app-fullscreen.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Enable fullscreen mode</desc>
   </info>
 
diff --git a/help/C/app-terminal-sizes.page b/help/C/app-terminal-sizes.page
index 20e6fdc..c46a88c 100644
--- a/help/C/app-terminal-sizes.page
+++ b/help/C/app-terminal-sizes.page
@@ -1,8 +1,11 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="app-terminal-sizes">
+
   <info>
     <revision version="0.1" date="2013-02-25" status="candidate"/>
+    <link type="guide" xref="index#appearence"/>
+    <link type="guide" xref="adv-keyboardshortcuts"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,8 +23,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#appearence"/>
-    <link type="guide" xref="adv-keyboardshortcuts"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Change the <app>Terminal</app> window size</desc>
 
diff --git a/help/C/app-zoom.page b/help/C/app-zoom.page
index bfc02f3..d9e0f1b 100644
--- a/help/C/app-zoom.page
+++ b/help/C/app-zoom.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="zoom-inout">
+
   <info>
     <revision version="0.1" date="2013-02-24" status="candidate"/>
+    <link type="guide" xref="index#appearence"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#appearence"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Increase or decrease text size.</desc>
 
diff --git a/help/C/gs-execute-commands.page b/help/C/gs-execute-commands.page
index 181cbe4..d9d7bea 100644
--- a/help/C/gs-execute-commands.page
+++ b/help/C/gs-execute-commands.page
@@ -24,6 +24,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Launch programs or run commands using <app>Terminal</app></desc>
   </info>
 
diff --git a/help/C/gs-tabs.page b/help/C/gs-tabs.page
index eb749d7..d7fc207 100644
--- a/help/C/gs-tabs.page
+++ b/help/C/gs-tabs.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Add, remove and reorder <app>Terminal</app> tabs.</desc>
   </info>
 
diff --git a/help/C/index.page b/help/C/index.page
index cda3df9..985c81c 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Use the command line.</desc>
   </info>
 
diff --git a/help/C/introduction.page b/help/C/introduction.page
index dbe9c28..aca00f8 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -22,6 +22,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>What is <app>Terminal</app>?</desc>
   </info>
 
diff --git a/help/C/legal.xml b/help/C/legal.xml
index 9d1f522..30e88c0 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -6,8 +6,7 @@ Attribution-Share Alike 3.0 Unported License</link> and a
 <link href="http://www.gnu.org/licenses/";>GNU General Public License version
 3</link>.</p>
 
-<section id="GPL">
-<title>GPL 3 notice</title>
+<p>GPL 3 statement:</p>
 <p>This work is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License.</p>
@@ -19,5 +18,4 @@ GNU General Public License for more details.</p>
 
 <p>You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.</p>
-</section>
 </license>
diff --git a/help/C/overview.page b/help/C/overview.page
index 11387d0..a9f0859 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -16,6 +16,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>What is a terminal?</desc>
   </info>
 
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index 34c5221..06fb56d 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="pref-bell">
+
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
+    <link type="guide" xref="index#preferences"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#preferences"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Enable audible notification in <app>Terminal</app></desc>
 
diff --git a/help/C/pref-compatibility.page.stub b/help/C/pref-compatibility.page.stub
index d1d2d6b..10275e6 100644
--- a/help/C/pref-compatibility.page.stub
+++ b/help/C/pref-compatibility.page.stub
@@ -17,6 +17,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Change behaviour of <key>Backspace</key> and <key>Delete</key> keys in <app>Terminal</app></desc>
   </info>
 
diff --git a/help/C/pref-custom-exit.page b/help/C/pref-custom-exit.page
index ff1d66a..ff7e157 100644
--- a/help/C/pref-custom-exit.page
+++ b/help/C/pref-custom-exit.page
@@ -1,8 +1,11 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic"
       id="pref-custom-exit">
+
   <info>
     <revision version="0.1" date="2013-03-02" status="candidate"/>
+    <link type="guide" xref="index#preferences"/>
+    <link type="seealso" xref="prob-recover-default-profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,8 +23,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#preferences"/>
-    <link type="seealso" xref="prob-recover-default-profile"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Set the behaviour of <app>Terminal</app> when a custom command or the default shell exits.</desc>
 
diff --git a/help/C/pref-custom-shells.page b/help/C/pref-custom-shells.page
index f29c133..9311292 100644
--- a/help/C/pref-custom-shells.page
+++ b/help/C/pref-custom-shells.page
@@ -1,13 +1,13 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic"
       id="pref-custom-shells">
+
   <info>
+    <revision version="0.1" date="2013-03-02" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
     <link type="seealso" xref="gs-execute-commands"/>
     <link type="seealso" xref="prob-add-to-path"/>
 
-    <revision version="0.1" date="2013-03-02" status="candidate"/>
-
     <credit type="author copyright">
       <name>Sindhu S</name>
       <email>sindhus live in</email>
@@ -24,6 +24,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Set <app>Terminal</app> to run a command or a different shell on startup.</desc>
 
   </info>
diff --git a/help/C/pref-keyboard-access.page b/help/C/pref-keyboard-access.page
index 49e00b7..c2fcad7 100644
--- a/help/C/pref-keyboard-access.page
+++ b/help/C/pref-keyboard-access.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Navigate around <app>Terminal</app> menus using keyboard keys.</desc>
   </info>
 
diff --git a/help/C/pref-login-shell.page b/help/C/pref-login-shell.page
index d7489ac..04805f7 100644
--- a/help/C/pref-login-shell.page
+++ b/help/C/pref-login-shell.page
@@ -22,6 +22,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Start a login shell in <app>Terminal</app>.</desc>
   </info>
 
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index fed9d63..a411d84 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -1,8 +1,12 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="pref-menubar">
+
   <info>
     <revision version="0.1" date="2013-02-21" status="candidate"/>
+    <link type="guide" xref="index#preferences"/>
+    <link type="seealso" xref="adv-keyboards-access"/>
+    <link type="seealso" xref="app-fullscreen"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,9 +24,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#preferences"/>
-    <link type="seealso" xref="adv-keyboards-access"/>
-    <link type="seealso" xref="app-fullscreen"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Hide and restore the menubar.</desc>
 
diff --git a/help/C/pref-profiles.page b/help/C/pref-profiles.page
index aebdf52..db4f9fd 100644
--- a/help/C/pref-profiles.page
+++ b/help/C/pref-profiles.page
@@ -22,6 +22,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Create, edit and delete profiles.</desc>
   </info>
 
diff --git a/help/C/pref-reset.page b/help/C/pref-reset.page
index 5b55f02..c93c276 100644
--- a/help/C/pref-reset.page
+++ b/help/C/pref-reset.page
@@ -13,6 +13,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Recover your <app>Terminal</app> screen.</desc>
   </info>
 
diff --git a/help/C/pref-scrolling.page b/help/C/pref-scrolling.page
index 7885064..c1edeff 100644
--- a/help/C/pref-scrolling.page
+++ b/help/C/pref-scrolling.page
@@ -17,6 +17,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Set scroll output and scrollbar behaviour.</desc>
   </info>
 
diff --git a/help/C/pref-title.page b/help/C/pref-title.page
index 4f913d7..1118215 100644
--- a/help/C/pref-title.page
+++ b/help/C/pref-title.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="pref-title">
+
   <info>
     <revision version="0.1" date="2013-02-18" status="candidate"/>
+    <link type="guide" xref="index#preferences"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,10 +22,9 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#preferences"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Allow commands to set the title for a <app>Terminal</app> tab or
-    window.</desc>
+    <desc>Allow commands to set the title for a <app>Terminal</app> tab or window.</desc>
 
   </info>
 
diff --git a/help/C/prob-add-to-path.page.stub b/help/C/prob-add-to-path.page.stub
index 89bf4f0..d3680d5 100644
--- a/help/C/prob-add-to-path.page.stub
+++ b/help/C/prob-add-to-path.page.stub
@@ -17,6 +17,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>A command will not execute with a <code>not found</code> error
     message: add directories to system <code>PATH</code>.</desc>
     <!-- TODO: improve wording. -->
diff --git a/help/C/prob-recover-default-profile.page.stub b/help/C/prob-recover-default-profile.page.stub
index 34c8f12..b473730 100644
--- a/help/C/prob-recover-default-profile.page.stub
+++ b/help/C/prob-recover-default-profile.page.stub
@@ -12,6 +12,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Reset changes to default profile</desc>
   </info>
 
@@ -28,4 +30,4 @@
     </item>
   </steps>
   
-</page>
\ No newline at end of file
+</page>
diff --git a/help/C/txt-copy-paste.page b/help/C/txt-copy-paste.page
index 627a6e1..ef28529 100644
--- a/help/C/txt-copy-paste.page
+++ b/help/C/txt-copy-paste.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Copy and paste text in <app>Terminal</app>.</desc>
 
   </info>
diff --git a/help/C/txt-links.page b/help/C/txt-links.page
index 468cc85..13a6f08 100644
--- a/help/C/txt-links.page
+++ b/help/C/txt-links.page
@@ -23,6 +23,8 @@
       <years>2013</years>
     </credit>
 
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
     <desc>Open links to web and email addresses.</desc>
   </info>
 
diff --git a/help/C/txt-save-text.page b/help/C/txt-save-text.page
index d9cc23a..5ee90c6 100644
--- a/help/C/txt-save-text.page
+++ b/help/C/txt-save-text.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="txt-save-text">
+
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
+    <link type="guide" xref="index#textoutput"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#textoutput"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Save <app>Terminal</app> output to a file.</desc>
 
diff --git a/help/C/txt-search.page b/help/C/txt-search.page
index f14d5f0..c5469fe 100644
--- a/help/C/txt-search.page
+++ b/help/C/txt-search.page
@@ -1,8 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="task"
       id="txt-search">
+
   <info>
     <revision version="0.1" date="2013-03-03" status="candidate"/>
+    <link type="guide" xref="index#textoutput"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -20,7 +22,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#textoutput"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Search the <app>Terminal</app> output.</desc>
 
diff --git a/help/C/txt-select-text.page b/help/C/txt-select-text.page
index 1e355d0..eed1c52 100644
--- a/help/C/txt-select-text.page
+++ b/help/C/txt-select-text.page
@@ -1,8 +1,11 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic"
       id="txt-select-text">
+
   <info>
     <revision version="0.1" date="2013-03-02" status="draft"/>
+    <link type="guide" xref="index#textoutput"/>
+    <link type="seelaso" xref="txt-copy-paste"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -15,8 +18,7 @@
       <years>2013</years>
     </credit>
 
-    <link type="guide" xref="index#textoutput"/>
-    <link type="seelaso" xref="txt-copy-paste"/>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
     <desc>Selecting text in <app>Terminal</app>.</desc>
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]