[clutter-tutorial] Stage Widget Scrolling section improvements.

[Murray Cumming <murrayc src gnome org>]

commit f664778aba36cfbef498bf76f95e30bb139d90b2
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon May 4 13:09:56 2009 +0200

    Stage Widget Scrolling section improvements.
    
    * docs/tutorial/clutter-tut.xml: Stage Widget Scrolling: Correct the text.
    In particular, I thing Johannes meant GtkRange rather than GtkRuler.
    Put the example inside the section.
    * docs/tutorial/figures/Makefile.am: Mention gtk_scrolling.png.
---
 ChangeLog                         |    9 +++++++++
 docs/tutorial/clutter-tut.xml     |   28 ++++++++--------------------
 docs/tutorial/figures/Makefile.am |    2 +-
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60d3919..ea6c9f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-04  Murray Cumming  <murrayc murrayc com>
+
+	Stage Widget Scrolling section improvements.
+	
+	* docs/tutorial/clutter-tut.xml: Stage Widget Scrolling: Correct the text.
+	In particular, I thing Johannes meant GtkRange rather than GtkRuler.
+	Put the example inside the section.
+	* docs/tutorial/figures/Makefile.am: Mention gtk_scrolling.png.
+
 2009-05-04  Johannes Schmid <jschmid openismus com>
 
   * examples/gtk_embed/main.c:
diff --git a/docs/tutorial/clutter-tut.xml b/docs/tutorial/clutter-tut.xml
index 8221953..76b8b76 100644
--- a/docs/tutorial/clutter-tut.xml
+++ b/docs/tutorial/clutter-tut.xml
@@ -321,40 +321,28 @@ gcc -Wall -g example.c -o example `pkg-config clutter-&clutterversion; clutter-g
 <sect1 id="actor-scrolling">
 <title>Stage Widget Scrolling</title>
 <para>
-When integrating <classname>ClutterActor</classname>s into &gtk; it can become
-necessary to implement scrolling due to limited screen space. Normally you would
-add a widget inside a <classname>GtkScrolledWindow</classname> to add scrolling
-capabilities. As clutter is accessing the graphic hardware directly bypassing the
-normal &gtk; drawing this is not possible with <classname>GtkClutterEmbed</classname>.
+When integrating a <classname>ClutterStage</classname>s into &gtk; with <classname>GtkClutterEmbed</classname>, you may need to scroll due to limited screen space. Normally you would add the widget inside a <classname>GtkScrolledWindow</classname> but this is not possible with <classname>GtkClutterEmbed</classname>, as &clutter; accesses the graphics hardware directly, bypassing the normal &gtk; drawing system.
 </para>
 <para>
-Instead you have to use a <classname>GtkClutterViewport</classname> which will
-take care of the scrolling. The <classname>GtkClutterViewport</classname> does
-not draw any scrollbars itself instead it uses a <classname>GtkAdjustment</classname> to
-determine the current scrolling position. Usually you will connect the 
-<classname>GtkAdjustment</classname> to a <classname>GtkScrollbar</classname> but
-it is also possible to change it directly or to connect it to some other widget 
-derived from <classname>GtkRuler</classname>.
+Instead you should use a <classname>GtkClutterViewport</classname>. Unlike <classname>GtkScrolledWindow</classname>, this does not draw any scrollbars itself. Instead it uses a <classname>GtkAdjustment</classname> which you should also use with your own <classname>GtkScrollbar</classname> widgets, or any other <classname>GtkRange</classname> widget, su such as <classname>GtkScale</classname>.
 </para>
 <para><ulink url="&url_refdocs_base_clutter_gtk;GtkClutterViewport.html">Reference</ulink></para>
-</sect1>
 
-<sect1 id="scrolling-actor-example"><title>Example</title>
+<sect2 id="scrolling-actor-example"><title>Example</title>
 <para>
-This example is simple image viewer that allows scrolling the image. 
-Esspecially interesting is the layout of the <classname>GtkTable</classname> with the two scrollbars as it
-is a quite common case and probably a good starting point for implementing basic
-scrolling in an application.
+This example is a simple image viewer that allows scrolling of the image. Note the layout of the <classname>GtkTable</classname>, with the two scrollbars.
 </para>
 
-<figure id="figure-scrolling-actor">
-  <title>Scrolling Actor</title>
+<figure id="figure-stage-widget-scrolling">
+  <title>Stage Widget Scrolling</title>
   <screenshot>
     <graphic format="PNG" fileref="&url_figures_base;gtk_scrolling.png"/>
   </screenshot>
 </figure>
 
 <para><ulink url="&url_examples_base;gtk_scrolling">Source Code</ulink></para>
+</sect2>
+
 </sect1>
 
 </chapter>
diff --git a/docs/tutorial/figures/Makefile.am b/docs/tutorial/figures/Makefile.am
index ae7ea7c..0e6000e 100644
--- a/docs/tutorial/figures/Makefile.am
+++ b/docs/tutorial/figures/Makefile.am
@@ -5,7 +5,7 @@ figuresdir = $(clutter_docdir)/tutorial/figures
 figures_DATA = actors.png actor_events.png actor_group.png actor_transformations.png \
                behaviours.png custom_actor.png custom_container.png full_example.png animation.png \
                multiline_text_entry.png stage.png \
-               stage_widget.png score.png scrolling.png timeline.png \
+               stage_widget.png gtk_scrolling.png score.png scrolling.png timeline.png \
                alpha-func.png path-alpha-func.png
 
 EXTRA_DIST = $(figures_DATA)