[orca] Fix for bug 655642 - Problems in the docs

[Joanmarie Diggs <joanied src gnome org>]

commit 1b36a7f8c254f342324ba42f4276e02993a059ea
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Sep 5 11:29:43 2011 -0400

    Fix for bug 655642 - Problems in the docs

 help/C/commands.page                 |    4 +-
 help/C/commands_braille.page         |    4 +-
 help/C/commands_magnifier.page       |   59 -----
 help/C/commands_speech_settings.page |    2 +-
 help/C/introduction.page             |   23 +--
 help/C/preferences_key_echo.page     |    2 +-
 help/C/preferences_magnifier.page    |  446 ----------------------------------
 help/C/preferences_speech.page       |    3 +-
 help/Makefile.am                     |    4 -
 9 files changed, 14 insertions(+), 533 deletions(-)
---
diff --git a/help/C/commands.page b/help/C/commands.page
index 5b1b81c..270326b 100644
--- a/help/C/commands.page
+++ b/help/C/commands.page
@@ -16,8 +16,8 @@
   <section id="getting_started"  style="2column">
     <title>Getting Started</title>
   </section>
-  <section id="speech_braille_magnification"  style="2column">
-    <title>Speech, Braille, and Magnification</title>
+  <section id="speech_braille"  style="2column">
+    <title>Speech and Braille</title>
   </section>
   <section id="reading_documents"  style="2column">
     <title>Reading Web Pages and Other Documents</title>
diff --git a/help/C/commands_braille.page b/help/C/commands_braille.page
index 359fb12..9dcc0ad 100644
--- a/help/C/commands_braille.page
+++ b/help/C/commands_braille.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"; type="topic" id="commands_braille">
   <info>
-    <link type="next" xref="commands_magnifier" />
-    <link type="guide" xref="commands#speech_braille_magnification" />
+    <link type="next" xref="commands_reading" />
+    <link type="guide" xref="commands#speech_braille" />
     <link type="seealso" xref="preferences_braille" />
     <title type="sort">2. Braille</title>
     <title type="link">Braille</title>
diff --git a/help/C/commands_speech_settings.page b/help/C/commands_speech_settings.page
index d31114c..1246b96 100644
--- a/help/C/commands_speech_settings.page
+++ b/help/C/commands_speech_settings.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"; type="topic" id="commands_speech_settings">
   <info>
     <link type="next" xref="commands_braille" />
-    <link type="guide" xref="commands#speech_braille_magnification" />
+    <link type="guide" xref="commands#speech_braille" />
     <link type="seealso" xref="preferences_speech"  />
     <title type="sort">2. Speech Settings</title>
     <title type="link">Speech</title>
diff --git a/help/C/introduction.page b/help/C/introduction.page
index 6631c9d..bdce61c 100644
--- a/help/C/introduction.page
+++ b/help/C/introduction.page
@@ -18,12 +18,11 @@
   <p>
     <app>Orca</app> is a free, open source, flexible, and extensible
     screen reader that provides access to the graphical desktop via
-    user-customizable combinations of speech, braille, and/or
-    magnification.
+    speech and refreshable braille.
   </p>
   <p>
     <app>Orca</app> works with applications and toolkits that support
-    the assistive technology service provider interface (AT-SPI), which
+    the Assistive Technology Service Provider Interface (AT-SPI), which
     is the primary assistive technology infrastructure for Linux and
     Solaris. Applications and toolkits supporting the AT-SPI include the
     GNOME Gtk+ toolkit, the Java platform's Swing toolkit, OpenOffice,
@@ -43,17 +42,11 @@
       </item>
       <item>
         <p>
-          Configure <app>Orca</app> to launch automatically, by enabling
-          this option in <app>Orca</app>'s <link xref="howto_text_setup">text
-          setup</link> or on the <gui>General</gui> page of <app>Orca</app>'s
-          <link xref="preferences">Preferences dialog</link>.
-        </p>
-      </item>
-      <item>
-        <p>
-          Configure <app>Orca</app> to be launched automatically as your
-          preferred screen reader by choosing this option in GNOME's
-          <gui>Assistive Technology Preferences</gui> dialog.
+          The method for configuring <app>Orca</app> to be launched
+          automatically as your preferred screen reader will depend upon
+          which desktop environment you use. For instance, in GNOME 3.x
+          this option can be found in the Universal Access Control Center
+          panel on the <gui>Seeing</gui> page.
         </p>
       </item>
     </list>
@@ -132,7 +125,6 @@
             <item><p><cmd>speech</cmd></p></item>
             <item><p><cmd>braille</cmd></p></item>
             <item><p><cmd>braille-monitor</cmd></p></item>
-            <item><p><cmd>magnifier</cmd></p></item>
             <item><p><cmd>main-window</cmd></p></item>
             <item><p><cmd>splash-window</cmd></p></item>
           </list>
@@ -147,7 +139,6 @@
             <item><p><cmd>speech</cmd></p></item>
             <item><p><cmd>braille</cmd></p></item>
             <item><p><cmd>braille-monitor</cmd></p></item>
-            <item><p><cmd>magnifier</cmd></p></item>
             <item><p><cmd>main-window</cmd></p></item>
             <item><p><cmd>splash-window</cmd></p></item>
           </list>
diff --git a/help/C/preferences_key_echo.page b/help/C/preferences_key_echo.page
index 0599054..631c623 100644
--- a/help/C/preferences_key_echo.page
+++ b/help/C/preferences_key_echo.page
@@ -6,7 +6,7 @@
       Configuring what is spoken as you type
     </desc>
     <link type="guide" xref="preferences#orca" />
-    <link type="next" xref="preferences_magnifier" />
+    <link type="next" xref="preferences_key_bindings" />
     <credit type="author">
       <name>Joanmarie Diggs</name>
       <email>joanied gnome org</email>
diff --git a/help/C/preferences_speech.page b/help/C/preferences_speech.page
index ad22ede..d6ff866 100644
--- a/help/C/preferences_speech.page
+++ b/help/C/preferences_speech.page
@@ -22,8 +22,7 @@
     <p>
       The <gui>Enable speech</gui> check box controls whether or not
       <app>Orca</app> will make use of a speech synthesizer.
-      Magnification-only and Braille-only users will likely want to
-      uncheck this checkbox.
+      Braille-only users will likely want to uncheck this checkbox.
     </p>
   </section>
   <section id="tts_options">
diff --git a/help/Makefile.am b/help/Makefile.am
index 30def53..30d1acb 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -23,14 +23,12 @@ DOC_FIGURES = \
 	figures/preferences_disable_gksu_keyboard_grab.png \
 	figures/preferences_enable_braille_monitor.png \
 	figures/preferences_enable_braille_support.png \
-	figures/preferences_enable_magnifier.png \
 	figures/preferences_enable_speech.png \
 	figures/preferences_gecko_find_options.png \
 	figures/preferences_gecko_page_navigation.png \
 	figures/preferences_key_bindings_table.png \
 	figures/preferences_keyboard_layout.png \
 	figures/preferences_key_echo.png \
-	figures/preferences_magnifier_advanced.png \
 	figures/preferences_only_speak_displayed_text.png \
 	figures/preferences_Orca_modifier_keys.png \
 	figures/preferences_present_tooltips.png \
@@ -69,7 +67,6 @@ DOC_PAGES = \
 	commands_find.page \
 	commands_flat_review.page \
 	commands_live_regions.page \
-	commands_magnifier.page \
 	commands_mouse.page \
 	commands.page \
 	commands_reading.page \
@@ -107,7 +104,6 @@ DOC_PAGES = \
 	preferences_introduction.page \
 	preferences_key_bindings.page \
 	preferences_key_echo.page \
-	preferences_magnifier.page \
 	preferences.page \
 	preferences_pronunciation.page \
 	preferences_speech.page \