GNOME.org
 

[gnome-games] Mahjongg/help: Makefile.am to compile new Mallard docs

commit 1854cba4ed6b274f69835c34bf0686df46366854
Author: Tiffany Antopolski <tiffany antopolski gmail com>
Date:   Sun Jan 1 05:26:23 2012 -0500

    Mahjongg/help: Makefile.am to compile new Mallard docs
    
    Added new legal.xml

 mahjongg/help/C/legal.xml    |   79 ++----------------------------------------
 mahjongg/help/C/license.page |   59 +++++++++++++++++++++++++++++++
 mahjongg/help/Makefile.am    |   39 +++++++++++++++-----
 3 files changed, 91 insertions(+), 86 deletions(-)
---
diff --git a/mahjongg/help/C/legal.xml b/mahjongg/help/C/legal.xml
index ac97e1d..686cc5c 100644
--- a/mahjongg/help/C/legal.xml
+++ b/mahjongg/help/C/legal.xml
@@ -1,76 +1,3 @@
-  <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/";>
+  <p>Creative Commons Share Alike 3.0</p>
+</license>
diff --git a/mahjongg/help/C/license.page b/mahjongg/help/C/license.page
new file mode 100644
index 0000000..1b34374
--- /dev/null
+++ b/mahjongg/help/C/license.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/";
+  type="topic"
+  id="license">
+  
+  <info>
+    <link type="seealso" xref="index"/>
+    <revision pkgversion="3.4" version="0.1" date="2011-12-27" status="candidate"/>
+    <desc>Legal information.</desc>
+  </info>
+
+  <title>License</title>
+  <p>
+    <!-- 
+    Translators: try to use the same translation as the one provided by the CreativeCommons website. 
+    If there is no translation for your language, consider providing one to CreativeCommons.
+    -->
+    This work is distributed under a CreativeCommons Attribution-Share Alike
+    3.0 Unported license.
+  </p>
+  <p>
+    You are free:
+  </p>
+  <terms>
+    <item>
+      <title><em>To share</em></title>
+      <p>To copy, distribute and transmit the work.</p>
+    </item>
+    <item>
+      <title><em>To remix</em></title>
+      <p>To adapt the work.</p> 
+    </item>
+  </terms>
+  <p>
+    Under the following conditions:
+  </p>
+  <terms>
+    <item>
+      <title><em>Attribution</em></title>
+      <p>
+        You must attribute the work in the manner specified by the author or 
+        licensor (but not in any way that suggests that they endorse you or 
+        your use of the work).  
+      </p>
+    </item>
+    <item>
+      <title><em>Share Alike</em></title>
+      <p>
+        If you alter, transform, or build upon this work, you may distribute the 
+        resulting work only under the same, similar or a compatible license.  
+      </p>
+    </item>
+  </terms>
+  <p>
+    <!-- Translators: there are no official localized versions of the legal code, only the deed is localized. -->
+    For the full text of the license, see the 
+    <link href="http://creativecommons.org/licenses/by-sa/3.0/legalcode";>CreativeCommons website</link>, 
+    or read the full <link href="http://creativecommons.org/licenses/by-sa/3.0/";>Commons Deed</link>. 
+  </p>
+</page>
diff --git a/mahjongg/help/Makefile.am b/mahjongg/help/Makefile.am
index 8d337f6..99c5b4d 100644
--- a/mahjongg/help/Makefile.am
+++ b/mahjongg/help/Makefile.am
@@ -1,18 +1,37 @@
 include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
 
-DOC_LINGUAS = ca cs da el en_GB es eu fr it oc pl ru sl sr sr latin sv de zh_CN
-
-DOC_MODULE = mahjongg
+DOC_ID = mahjongg
+DOC_INCLUDES = legal.xml
 
-DOC_ENTITIES = \
-	legal.xml
 
 DOC_FIGURES = \
-	figures/mahjongg.png \
-	figures/no-move.png \
-	figures/preferences.png \
-	figures/toolbar.png
+	figures/hints-video.ogv		\
+	figures/logo32.png		\
+	figures/logo.png		\
+	figures/mahjongg-video.ogv	\
+	figures/moves-left.png
 
-dist-hook: doc-dist-hook
+DOC_PAGES = \
+	bug-filing.page			\
+	choosing.page			\
+	commandline.page		\
+	develop.page			\
+	documentation.page		\
+	eligible.page			\
+	gameplay.page			\
+	highscoretable.page		\
+	hints.page			\
+	index.page			\
+	license.page			\
+	moves.page			\
+	scoring.page			\
+	shuffling.page			\
+	starting.page			\
+	toolbar.page			\
+	translate.page			\
+	undo.page
+
+DOC_LINGUAS = ca cs da el en_GB es eu fr it oc pl ru sl sr sr latin sv de zh_CN
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]