[eog] Death to Docbook! Long live MALLARD!



commit 3d295b7fddca8432706da6cba6044e6acb459f6d
Author: Ryan Lortie <desrt desrt ca>
Date:   Thu Apr 28 00:13:22 2011 -0400

    Death to Docbook!  Long live MALLARD!
    
    Toss the old docbook-based documentation and update the Makefile to
    build and install the new Mallard-based documentation.

 help/C/eog.xml                               |  800 --------------------------
 help/C/figures/eog_save_as_window.png        |  Bin 23436 -> 0 bytes
 help/C/figures/eog_start_window.png          |  Bin 8424 -> 0 bytes
 help/C/figures/eog_toolbar_editor_window.png |  Bin 20277 -> 0 bytes
 help/C/legal.xml                             |   85 +---
 help/Makefile.am                             |   62 ++-
 6 files changed, 64 insertions(+), 883 deletions(-)
---
diff --git a/help/C/legal.xml b/help/C/legal.xml
index d6906f9..0e59883 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,76 +1,9 @@
-   <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>
- 
\ No newline at end of file
+<license xmlns="http://projectmallard.org/1.0/";
+ href="http://creativecommons.org/licenses/by-sa/3.0/us/";>
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/us/";>Creative Commons
+Attribution-Share Alike 3.0 United States License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/Makefile.am b/help/Makefile.am
index f0abfcf..a3290ec 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,13 +1,61 @@
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
-DOC_MODULE = eog
-DOC_ENTITIES = legal.xml
-DOC_INCLUDES =
-DOC_FIGURES = 					\
-	figures/eog_save_as_window.png		\
-	figures/eog_start_window.png		\
-	figures/eog_toolbar_editor_window.png
+DOC_ID = eog
+DOC_INCLUDES = legal.xml
+
+DOC_FIGURES = \
+	figures/eog-bestfit.png			\
+	figures/eog-enlarge.png			\
+	figures/eog-normalsize.png		\
+	figures/eog.png				\
+	figures/eog-shrink.png			\
+	figures/eog-toolbar-default.png		\
+	figures/eog-toolbar-editor.png		\
+	figures/image-view-prefs.png		\
+	figures/multiple-convert.png		\
+	figures/multiple-rename-count.png	\
+	figures/plugins-all.png			\
+	figures/plugin-send-by-mail.png		\
+	figures/plugin-tools-flickr.png		\
+	figures/prefs-plugins-date.png		\
+	figures/prefs-plugins-fullscreen.png	\
+	figures/prefs-plugins.png		\
+	figures/slideshow-prefs.png
+
+DOC_PAGES = \
+	bug-filing.page				\
+	commandline.page			\
+	copy-paste.page				\
+	default.page				\
+	delete.page				\
+	desktop-background.page			\
+	edit.page				\
+	flip-rotate.page			\
+	format-change.page			\
+	formats-save.page			\
+	formats-view.page			\
+	index.page				\
+	introduction.page			\
+	open.page				\
+	plugin-date-statusbar.page		\
+	plugin-exif-digital.page		\
+	plugin-fullscreen-double-click.page	\
+	plugin-map.page				\
+	plugin-postr.page			\
+	plugin-python-console.page		\
+	plugin-send-by-mail.page		\
+	plugin-slideshow-shuffle.page		\
+	plugins.page				\
+	plugin-zoom-width.page			\
+	preferences.page			\
+	print.page				\
+	rename-multiple.page			\
+	shortcuts.page				\
+	slideshow.page				\
+	toolbar.page				\
+	view.page				\
+	zoom.page
 
 DOC_LINGUAS = ar ca cs da de el en_GB es eu fi fr it ja ko oc pa pl pt_BR ru sl sv th uk zh_CN zh_TW
 



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