[Xfce4-commits] <xfce4-docs:ristretto-master> Add 'getting-started page'

[Stephan Arts]

Updating branch refs/heads/ristretto-master
         to 0e591ff7fb0cad2499a9514296a003cf4a6f0ef2 (commit)
       from 33d04312d44a6d66a32da1dec0996a55d62476bc (commit)

commit 0e591ff7fb0cad2499a9514296a003cf4a6f0ef2
Author: Stephan Arts <stephan at xfce.org>
Date:   Sun Oct 30 00:02:43 2011 +0200

    Add 'getting-started page'
    
    - Remove original setup of docs

 manual/Makefile.am                              |    4 +--
 manual/{slideshow.page => getting-started.page} |   17 +++++++++----
 manual/index.page                               |    6 +++-
 manual/set-wallpaper.page                       |   25 -------------------
 manual/view-images.page                         |   30 -----------------------
 5 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/manual/Makefile.am b/manual/Makefile.am
index 462bd1a..2a2f895 100644
--- a/manual/Makefile.am
+++ b/manual/Makefile.am
@@ -4,9 +4,7 @@ SUBDIRS = \
 
 MALLARD_PAGES = \
 	index.page \
-    view-images.page \
-    slideshow.page \
-    set-wallpaper.page
+    getting-started.page
 
 LINGUAS = $(shell cd $(srcdir)/po && echo `/bin/ls *.po | sed 's,[.]po,,g'`)
 ALL_LINGUAS = C $(LINGUAS)
diff --git a/manual/slideshow.page b/manual/getting-started.page
similarity index 52%
rename from manual/slideshow.page
rename to manual/getting-started.page
index 7988a73..2d20680 100644
--- a/manual/slideshow.page
+++ b/manual/getting-started.page
@@ -1,12 +1,12 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
       type="topic"
-      id="slideshow">
+      id="getting-started">
 
     <info>
-        <link type="guide" xref="index#image-viewer"/>
+        <link type="guide" xref="index#introduction"/>
         <link type="seealso" xref="preferences"/>
-        <desc>Show a slideshow of images</desc>
+        <desc>Getting started with <app>Ristretto Image Viewer</app></desc>
         <credit type="author">
         <name>Stephan Arts</name>
         <email>stephan at xfce.org</email>
@@ -16,8 +16,15 @@
         </license>
     </info>
 
-    <title>Slideshow</title>
-    <p></p>
+    <title>Getting Started...</title>
+    <p>
+    When <app>Ristretto Image Viewer</app> is first started, it shows an
+    empty window with two toolbars. 
+    </p>
+    <figure>
+        <title>First Started</title>
+        <media type="image" src="media/ristretto.png" mime="image/png" style="right"/>
+    </figure>
 
     <section id="slideshow-settings">
         <title>Configuring</title>
diff --git a/manual/index.page b/manual/index.page
index d714e5d..6e5bbf0 100644
--- a/manual/index.page
+++ b/manual/index.page
@@ -21,14 +21,16 @@
     <section id="introduction">
         <title>Introduction</title>
         <p>
-        The Ristretto Image Viewer is an application that can be used to
-        scroll through images. It can be used to run a slideshow of
+        The <app>Ristretto Image Viewer</app> is an application that can be
+        used to scroll through images. It can be used to run a slideshow of
         images, open images with other applications like an image-editor
         or set the Xfce wallpaper.
         </p>
     </section>
 
+    <!--
     <section id="image-viewer" style="2column">
         <title>Image Viewer</title>
     </section>
+    -->
 </page>
diff --git a/manual/set-wallpaper.page b/manual/set-wallpaper.page
deleted file mode 100644
index aa71a17..0000000
--- a/manual/set-wallpaper.page
+++ /dev/null
@@ -1,25 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:e="http://projectmallard.org/experimental/"
-      type="topic"
-      id="set-wallpaper">
-
-    <info>
-        <link type="guide" xref="index#image-viewer"/>
-        <link type="seealso" xref="preferences"/>
-        <desc>Setting the Xfce wallpaper with <app>Ristretto</app></desc>
-        <credit type="author">
-        <name>Stephan Arts</name>
-        <email>stephan at xfce.org</email>
-        </credit>
-        <license>
-            <p>Creative Commons Share Alike 3.0</p>
-        </license>
-    </info>
-
-    <title>Set Wallpaper</title>
-    <p></p>
-    <figure>
-        <title>Ristretto</title>
-        <media type="image" src="media/open-image.png" mime="image/png" style="right"/>
-    </figure>
-</page>
diff --git a/manual/view-images.page b/manual/view-images.page
deleted file mode 100644
index e9269c7..0000000
--- a/manual/view-images.page
+++ /dev/null
@@ -1,30 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      xmlns:e="http://projectmallard.org/experimental/"
-      type="topic"
-      id="view-images">
-
-    <info>
-        <link type="guide" xref="index#image-viewer"/>
-        <link type="seealso" xref="preferences"/>
-        <desc>Viewing images with <app>Ristretto</app></desc>
-        <credit type="author">
-        <name>Stephan Arts</name>
-        <email>stephan at xfce.org</email>
-        </credit>
-        <license>
-            <p>Creative Commons Share Alike 3.0</p>
-        </license>
-    </info>
-
-    <title>View Images</title>
-    <p></p>
-    <figure>
-        <title>Ristretto</title>
-        <media type="image" src="media/ristretto.png" mime="image/png" style="right"/>
-    </figure>
-    <p></p>
-    <figure>
-        <title>Open Images</title>
-        <media type="image" src="media/view-images-1.png" mime="image/png" style="right"/>
-    </figure>
-</page>