From b0fb31149e20b5adc6d80fe6642fefa9a1aebe4f Mon Sep 17 00:00:00 2001
From: Tiffany Antopolski <antopolski@src.gnome.org>
Date: Tue, 16 Nov 2010 23:06:27 -0500
Subject: [PATCH] docs: improvements to Reading section

Shortened the title of finding.page to fit on one line. Merged
zooming.page into movingaround.page and deleted zooming.page.  Removed
extra character at end of file in forms-saving.page.

Removed zooming.page from Makefile.am.
---
 help/C/finding.page      |  4 +--
 help/C/forms-saving.page |  2 +-
 help/C/movingaround.page | 40 +++++++++++++++++++++++++++-
 help/C/zooming.page      | 57 ----------------------------------------
 help/Makefile.am         |  3 +--
 5 files changed, 43 insertions(+), 63 deletions(-)
 delete mode 100644 help/C/zooming.page

diff --git a/help/C/finding.page b/help/C/finding.page
index 4181f34b..860c9aa1 100644
--- a/help/C/finding.page
+++ b/help/C/finding.page
@@ -5,7 +5,7 @@
 
   <info>
     <link type="guide" xref="index#reading"/>
-    <desc>Search for a given term on a page.</desc>
+    <desc>Find a word or phrase in a document.</desc>
 
     <revision pkgversion="2.32" version="0.1" date="2010-11-08" status="review"/>
     <credit type="author">
@@ -18,7 +18,7 @@
 
   </info>
 
-<title>Finding Words and Phrases In A Document</title>
+<title>Finding Text In A Document</title>
 <steps>
     <item><p>Click <guiseq><gui>Edit</gui><gui>Find</gui></guiseq> or press
     <keyseq><key>Ctrl</key><key>F</key></keyseq> or <key>/</key> to display a
diff --git a/help/C/forms-saving.page b/help/C/forms-saving.page
index e4bc3113..215167c5 100644
--- a/help/C/forms-saving.page
+++ b/help/C/forms-saving.page
@@ -74,4 +74,4 @@
 </p>
 </note>
 
-</page>q
+</page>
diff --git a/help/C/movingaround.page b/help/C/movingaround.page
index 00ee6701..b7712f75 100644
--- a/help/C/movingaround.page
+++ b/help/C/movingaround.page
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="index#reading"/>
-    <desc>Scrolling and navigating around a page.</desc>
+    <desc>Navigating, scrolling and zooming.</desc>
 
     <revision pkgversion="2.30.3" version="0.1" date="2010-07-26" status="review"/>
     <credit type="author">
@@ -132,4 +132,42 @@ You can move around each page of a document by any of the following methods:
 
 </section>
 
+<section>
+ <title>Zooming In and Out</title>
+ <list>
+ <item><p>Click <guiseq><gui>View</gui><gui>Zoom In</gui></guiseq> or use the keyboard shortcuts <keyseq><key>Ctrl</key><key>+</key></keyseq> to zoom in.</p></item>
+<item><p>Click <guiseq><gui>View</gui><gui>Zoom Out</gui></guiseq> or use the keyboard shortcuts <keyseq><key>Ctrl</key><key>-</key></keyseq> to zoom out.</p></item>
+</list>
+
+<p>Alternatively, you can do one of the following:</p>
+<list>
+ <item><p>hold down <key>Ctrl</key> and use your mouse scroll wheel to zoom.</p></item>
+ <item><p>select desired zoom percentage from the drop down menu above the window.</p>
+ <media type="image" src="zoom.png"/>
+ </item>
+</list>
+<note>
+<p>
+The <gui>Best Fit</gui> option will make a document page fit the whole <em>height</em> of the window. </p>
+<p>The <gui>Fit Page Width</gui> option will make a
+document page fill the whole <em>width</em> of the window.
+</p>
+<p>
+If you want to see two pages at once, side by side, like in a book, click
+<guiseq><gui>View</gui><gui>Dual</gui></guiseq>.
+</p>
+</note>
+<p>You can use the whole of your screen to view the document:</p>
+
+<list>
+   <item><p>Click <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</key>. </p></item>
+   <item><p>To exit from the full screen mode:</p>
+    <list>
+      <item><p>Press <key>F11</key> or <key>Escape</key></p></item>
+      <item><p>or click the <gui>Leave Fullscreen</gui> button at the top of the screen.</p></item>
+    </list>
+   </item>
+</list>
+</section>
+
 </page>
diff --git a/help/C/zooming.page b/help/C/zooming.page
deleted file mode 100644
index 5c467f1d..00000000
--- a/help/C/zooming.page
+++ /dev/null
@@ -1,57 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="topic" style="task"
-      id="zooming">
-
-  <info>
-    <link type="guide" xref="index#reading"/>
-    <desc>Change the size of the document by zooming in or out of the page.</desc>
-
-    <revision pkgversion="2.30.3" version="0.1" date="2010-07-26" status="review"/>
-    <credit type="author">
-      <name>Phil Bull</name>
-      <email>philbull@gmail.com</email>
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
-  </info>
-
-<title>Zooming In And Out</title>
-
-<list>
- <item><p>Click <guiseq><gui>View</gui><gui>Zoom In</gui></guiseq> or use the keyboard shortcuts <keyseq><key>Ctrl</key><key>+</key></keyseq> to zoom in.</p></item>
-<item><p>Click <guiseq><gui>View</gui><gui>Zoom Out</gui></guiseq> or use the keyboard shortcuts <keyseq><key>Ctrl</key><key>-</key></keyseq> to zoom out.</p></item>
-</list>
-
-<p>Alternatively, you can do one of the following:</p>
-<list>
- <item><p>hold down <key>Ctrl</key> and use your mouse scroll wheel to zoom.</p></item>
- <item><p>select desired zoom percentage from the drop down menu above the window.</p>
- <media type="image" src="zoom.png"/>
- </item>
-</list>
-<note>
-<p>
-The <gui>Best Fit</gui> option will make a document page fit the whole <em>height</em> of the window. </p>
-<p>The <gui>Fit Page Width</gui> option will make a
-document page fill the whole <em>width</em> of the window.
-</p>
-<p>
-If you want to see two pages at once, side by side, like in a book, click
-<guiseq><gui>View</gui><gui>Dual</gui></guiseq>.
-</p>
-</note>
-<p>You can use the whole of your screen to view the document:</p>
-
-<list>
-   <item><p>Click <guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</key>. </p></item>
-   <item><p>To exit from the full screen mode:</p>
-    <list>
-      <item><p>Press <key>F11</key> or <key>Escape</key></p></item>
-      <item><p>or click the <gui>Leave Fullscreen</gui> button at the top of the screen.</p></item>
-    </list>
-   </item>
-</list>
-
-</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index bfa93ea1..b41cc2f8 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -81,8 +81,7 @@ DOC_PAGES = \
 	synctex-editors.page		\
 	synctex-search.page		\
 	synctex-support.page		\
-	textselection.page		\
-	zooming.page
+	textselection.page
 
 DOC_LINGUAS = bg ca cs de el en_GB es eu fi fr gl it ja nl oc pt_BR ru sl sr sv uk vi zh_CN
 
-- 
2.43.0