summaryrefslogtreecommitdiff
path: root/help
diff options
context:
space:
mode:
authorDavid King <amigadave@amigadave.com>2013-06-28 13:20:02 +0100
committerDavid King <amigadave@amigadave.com>2013-08-06 14:11:39 +0100
commit60ae14617d9b9190cc8bd931dba849aa50c7b942 (patch)
treeedb837e253eab5c6f2ab28abfe20f27d21e3bf9d /help
parent712e6ed16fbf9e13b97cb631731a5617497ece22 (diff)
License help under CC-BY-SA 3.0 Unported
The help was not explicitly under a license, as described in bug 703238. Specify the license as CC-BY-SA 3.0 to match with other GNOME help: https://wiki.gnome.org/DocumentationProject/Licensing License clarification approved by help contributors (found with "git shortlog help/C/*.page") as listed below: Signed-off-by: Jeremy Bicha <jbicha@ubuntu.com> Signed-off-by: Ekaterina Gerasimova <kittykat3756@gmail.com> Signed-off-by: Michael Hill <mdhill@gnome.org> Signed-off-by: Tiffany Ann Antopolski <tiffany.antopolski@gmail.com> Signed-off-by: Julita Inca <jinca@gnome.org>
Diffstat (limited to 'help')
-rw-r--r--help/C/burst-mode.page2
-rw-r--r--help/C/card-graphic.page.stub2
-rw-r--r--help/C/closed.page.stub2
-rw-r--r--help/C/effects-apply.page2
-rw-r--r--help/C/index.page2
-rw-r--r--help/C/introduction.page2
-rw-r--r--help/C/legal.xml8
-rw-r--r--help/C/mode-wide.page.stub2
-rw-r--r--help/C/no-device.page.stub2
-rw-r--r--help/C/photo-delete.page2
-rw-r--r--help/C/photo-save.page2
-rw-r--r--help/C/photo-take.page2
-rw-r--r--help/C/photo-view.page2
-rw-r--r--help/C/pref-countdown.page2
-rw-r--r--help/C/pref-flash.page2
-rw-r--r--help/C/pref-fullscreen.page2
-rw-r--r--help/C/pref-image-properties.page2
-rw-r--r--help/C/pref-resolution.page2
-rw-r--r--help/C/video-record.page2
-rw-r--r--help/C/webcams.page.stub2
-rw-r--r--help/Makefile.am1
21 files changed, 47 insertions, 0 deletions
diff --git a/help/C/burst-mode.page b/help/C/burst-mode.page
index c0d64ed5..c53593b9 100644
--- a/help/C/burst-mode.page
+++ b/help/C/burst-mode.page
@@ -20,6 +20,8 @@
<years>2011, 2013</years>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Capture several photos with one button press. Change your pose in between each shot!</desc>
</info>
diff --git a/help/C/card-graphic.page.stub b/help/C/card-graphic.page.stub
index 08079308..1c89d7e4 100644
--- a/help/C/card-graphic.page.stub
+++ b/help/C/card-graphic.page.stub
@@ -12,6 +12,8 @@
<years>2011</years>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>XXXXX</desc>
</info>
diff --git a/help/C/closed.page.stub b/help/C/closed.page.stub
index 8d72212f..51268575 100644
--- a/help/C/closed.page.stub
+++ b/help/C/closed.page.stub
@@ -10,6 +10,8 @@
<years>2011</years>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>The application closes itself after a while sometimes.</desc>
</info>
diff --git a/help/C/effects-apply.page b/help/C/effects-apply.page
index 9c361283..73a00147 100644
--- a/help/C/effects-apply.page
+++ b/help/C/effects-apply.page
@@ -15,6 +15,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Add fun effects to your photos and videos, like turning yourself green
or distorting the picture like a funhouse mirror.</desc>
</info>
diff --git a/help/C/index.page b/help/C/index.page
index bfa126c6..d2a0a798 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -16,6 +16,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Cheese lets you take photos and videos using your webcam. You can
even add special effects!</desc>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index da21997e..7b5e355f 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -20,6 +20,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Introduction to the <app>Cheese</app> webcam application.</desc>
</info>
diff --git a/help/C/legal.xml b/help/C/legal.xml
new file mode 100644
index 00000000..aa36246c
--- /dev/null
+++ b/help/C/legal.xml
@@ -0,0 +1,8 @@
+<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/help/C/mode-wide.page.stub b/help/C/mode-wide.page.stub
index dfb61acd..e4368799 100644
--- a/help/C/mode-wide.page.stub
+++ b/help/C/mode-wide.page.stub
@@ -16,6 +16,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Change the position of the photo stream so that the webcam video feed
is larger.</desc>
</info>
diff --git a/help/C/no-device.page.stub b/help/C/no-device.page.stub
index 8aed6251..2c82ca15 100644
--- a/help/C/no-device.page.stub
+++ b/help/C/no-device.page.stub
@@ -12,6 +12,8 @@
<years>2011</years>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc><app>Cheese</app> does not recognize your webcam.</desc>
</info>
diff --git a/help/C/photo-delete.page b/help/C/photo-delete.page
index 987d5bd6..416f167c 100644
--- a/help/C/photo-delete.page
+++ b/help/C/photo-delete.page
@@ -16,6 +16,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Remove photos and videos that you no longer want to keep.</desc>
</info>
diff --git a/help/C/photo-save.page b/help/C/photo-save.page
index c3960439..11e83e1e 100644
--- a/help/C/photo-save.page
+++ b/help/C/photo-save.page
@@ -16,6 +16,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Save a photo or video in a different folder.</desc>
</info>
diff --git a/help/C/photo-take.page b/help/C/photo-take.page
index 64be7ec3..c3fbcce0 100644
--- a/help/C/photo-take.page
+++ b/help/C/photo-take.page
@@ -24,6 +24,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Use your webcam to take photos instead of videos.</desc>
</info>
diff --git a/help/C/photo-view.page b/help/C/photo-view.page
index b0198ca7..a133aff4 100644
--- a/help/C/photo-view.page
+++ b/help/C/photo-view.page
@@ -16,6 +16,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Photos and videos will automatically appear in the photo stream.</desc>
</info>
diff --git a/help/C/pref-countdown.page b/help/C/pref-countdown.page
index 976c390a..8c0e38ac 100644
--- a/help/C/pref-countdown.page
+++ b/help/C/pref-countdown.page
@@ -19,6 +19,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Remove the countdown so that photos are taken instantly.</desc>
</info>
diff --git a/help/C/pref-flash.page b/help/C/pref-flash.page
index 5ec3f8e9..5faa86ea 100644
--- a/help/C/pref-flash.page
+++ b/help/C/pref-flash.page
@@ -19,6 +19,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Stop the screen from flashing white when taking a photo.</desc>
</info>
diff --git a/help/C/pref-fullscreen.page b/help/C/pref-fullscreen.page
index ca3ad630..c6901bec 100644
--- a/help/C/pref-fullscreen.page
+++ b/help/C/pref-fullscreen.page
@@ -10,6 +10,8 @@
<email>kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Enable and disable fullscreen mode</desc>
</info>
diff --git a/help/C/pref-image-properties.page b/help/C/pref-image-properties.page
index 8f321888..02daa79f 100644
--- a/help/C/pref-image-properties.page
+++ b/help/C/pref-image-properties.page
@@ -20,6 +20,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Adjust the saturation, contrast, brightness and hue to make photos and videos look better.</desc>
</info>
diff --git a/help/C/pref-resolution.page b/help/C/pref-resolution.page
index 26bdf872..956c53c2 100644
--- a/help/C/pref-resolution.page
+++ b/help/C/pref-resolution.page
@@ -18,6 +18,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>The resolution of a video or photo determines how much detail you can
see in it, changing it will affect the file size.</desc>
diff --git a/help/C/video-record.page b/help/C/video-record.page
index 315304ad..f4b01bd9 100644
--- a/help/C/video-record.page
+++ b/help/C/video-record.page
@@ -19,6 +19,8 @@
<email its:translate="no">kittykat3756@gmail.com</email>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>Use your webcam to record short movies for sharing with friends.</desc>
</info>
diff --git a/help/C/webcams.page.stub b/help/C/webcams.page.stub
index 1f53acee..de51ff27 100644
--- a/help/C/webcams.page.stub
+++ b/help/C/webcams.page.stub
@@ -11,6 +11,8 @@
<years>2011</years>
</credit>
+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+
<desc>There is a list of some webcams and drivers that works good with Cheese.</desc>
</info>
diff --git a/help/Makefile.am b/help/Makefile.am
index c1227af1..1ae239b1 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -19,6 +19,7 @@ HELP_FILES = \
effects-apply.page \
index.page \
introduction.page \
+ legal.xml \
photo-delete.page \
photo-save.page \
photo-take.page \