commit dc7682609bec063739bf228970d4233b7f6a58b9
Author: John J. McDonough <jjmcd(a)fedoraproject.org>
Date: Tue Jul 27 13:58:09 2010 -0400
Correct some earlier merge problems
en-US/Article_Info.xml | 5 ----
en-US/Mouse_Tools.xml | 9 --------
en-US/Other_Tools.xml | 4 ---
en-US/Revision_History.xml | 48 --------------------------------------------
en-US/Screen_Readers.xml | 6 -----
publican.cfg | 6 +----
6 files changed, 1 insertions(+), 77 deletions(-)
---
diff --git a/en-US/Article_Info.xml b/en-US/Article_Info.xml
index e17405b..a8ea92d 100644
--- a/en-US/Article_Info.xml
+++ b/en-US/Article_Info.xml
@@ -6,13 +6,8 @@
<title>Accessibility Guide</title>
<subtitle>Using Fedora with a visual, hearing, or mobility
impairment</subtitle>
<productname>Fedora</productname>
-<<<<<<< HEAD
- <productnumber>12</productnumber>
- <edition>12.0</edition>
-=======
<productnumber>13</productnumber>
<edition>0.10</edition>
->>>>>>> f13
<pubsnumber>1</pubsnumber>
<abstract>
<para>This document describes some of the hardware devices, applications, and
utilities available to assist people with disabilities to use a computer with the Fedora
operating system.</para>
diff --git a/en-US/Mouse_Tools.xml b/en-US/Mouse_Tools.xml
index 994fdd8..467336f 100644
--- a/en-US/Mouse_Tools.xml
+++ b/en-US/Mouse_Tools.xml
@@ -2,23 +2,14 @@
<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<section id="Mouse_Tools">
-<<<<<<< HEAD
- <title>Mouse tools</title>
- <para>There are a number of tools available which provide accessibility
enhancements for using the mouse.</para>
-=======
<title>Mouse Tools</title>
<para>Mouse tools allow the mouse to be used in different ways, and provide an
alternate solution to people with limited mobility.</para>
->>>>>>> f13
<section>
<title>KMouseTool</title>
<para>A program for KDE, <application>KMouseTool,</application>
provides an alternate method for clicking the mouse by clicking the mouse whenever the
cursor pauses and even provides a dragging capability.
<application>KMouseTool</application> works with any mouse or pointing
device.</para>
<section>
<title>Installing KMouseTool</title>
-<<<<<<< HEAD
- <para>In Fedora, <application>KMouseTool</application> is packaged
in the <package>kdeaccessibility</package> package. This package also
contains kmagnifier, kmouth, and ktts, all of which are discussed in other areas of this
guide. To install <package>kdeaccessibility</package> you can either select
<menuchoice><guilabel>System > Administration > Add/Remove
Software</guilabel></menuchoice> and then type in
<package>kdeaccessibility</package> in the screen that pops up or in a
terminal window type <command>su -c "yum install
kdeaccessibility"</command>.</para>
-=======
<para>In Fedora, <application>KMouseTool</application> is packaged
in the <package>kdeaccessibility</package> package. This package also
contains kmagnifier, kmouth, and ktts, all of which are discussed in other areas of this
guide. To install <package>kdeaccessibility</package> you can either select
<menuchoice><guilabel>System > Administration > Add/Remove
Software</guilabel></menuchoice> and then type in
<package>kdeaccessibility</package> in the screen that pops up, or in a
terminal window type su -c "yum install kdeaccessibility".</para>
->>>>>>> f13
</section>
</section>
<section>
diff --git a/en-US/Other_Tools.xml b/en-US/Other_Tools.xml
index f638f25..804cf66 100644
--- a/en-US/Other_Tools.xml
+++ b/en-US/Other_Tools.xml
@@ -13,11 +13,7 @@
<para>Let your computer do the talking using
<application>KMouth</application>! You can setup phrases you would like to
say and your computer will speak them for you. You can even use your own phrasebooks.
Visit <ulink
url="http://www.schmi-dt.de/kmouth/index.en.html"></ulink> for
additional information on <application>KMouth</application>.</para>
<section>
<title>Installing KMouth</title>
-<<<<<<< HEAD
- <para>In Fedora,
<application>KMouth</application> is packaged in the
<package>kdeaccessibility</package> package. This package also contains
kmagnifier, kmousetool, and ktts, all of which are discussed in other areas of this guide.
To install <package>kdeaccessibility</package> you can either select
<menuchoice><guilabel>System > Administration > Add/Remove
Software</guilabel></menuchoice> and then type in kdeaccessibility in the
screen that pops up or in a terminal window type <command>su -c "yum install
kdeaccessibility"</command>.</para>
-=======
<para>In Fedora,
<application>KMouth</application> is packaged in the
<package>kdeaccessibility</package> package. This package also contains
kmagnifier, kmousetool, and ktts, all of which are discussed in other areas of this guide.
To install <package>kdeaccessibility</package> you can either select
<menuchoice><guilabel>System > Administration > Add/Remove
Software</guilabel></menuchoice> and then type
<package>kdeaccessibility</package> in the screen that pops up or in a
terminal window type su -c "yum install kdeaccessibility".</para>
->>>>>>> f13
</section>
</section>
<!-- moved Dasher and Caribou, to a separate section titled On_Screen_Keyboards
-->
diff --git a/en-US/Revision_History.xml b/en-US/Revision_History.xml
index 1d6ad9a..1fbf232 100644
--- a/en-US/Revision_History.xml
+++ b/en-US/Revision_History.xml
@@ -6,53 +6,6 @@
<simpara>
<revhistory>
<revision>
-<<<<<<< HEAD
- <revnumber>12.0-1</revnumber>
- <date>Sat Nov 28 2009</date>
- <author>
- <firstname>Eric</firstname>
- <surname>Christensen</surname>
- <email>sparks(a)fedoraproject.org</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Commented out Emacspeak sections that still need
work.</member>
- <member>Changed to be the official version for Fedora
12.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>0.9-2</revnumber>
- <date>Sat Nov 28 2009</date>
- <author>
- <firstname>Susan</firstname>
- <surname>Lauber</surname>
- <email>laubersm(a)fedoraproject.org</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Made some minor readability, grammar, and style
edits.</member>
- <member>Added a number of markup additions for
consistancy.</member>
- <member>Added information on enabling Orca in GNOME to the
Screen_Readers section.</member>
- <member>Added information on GNOME Magnifier to the Screen_Magnifiers
section.</member>
- <member>Moved On Screen Keyboards to their own section to clean up
Other Tools.</member>
- <member>Added information on gok (GNOME On-Screen
Keyboard).</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>0.9-1</revnumber>
- <date>Sun Nov 22 2009</date>
- <author>
- <firstname>Eric</firstname>
- <surname>Christensen</surname>
- <email>sparks(a)fedoraproject.org</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added Gnome features Dasher and Caribou.</member>
- <member>Commented out dated information on how Red Hat and Fedora had
or had not tested some of the FOSS solutions.</member>
-=======
<revnumber>0.10-1</revnumber>
<date>Wed Apr 21 2010</date>
<author>
@@ -77,7 +30,6 @@
<revdescription>
<simplelist>
<member>Updated section 4.3.2 to fix inconsistent
instructions.</member>
->>>>>>> f13
</simplelist>
</revdescription>
</revision>
diff --git a/en-US/Screen_Readers.xml b/en-US/Screen_Readers.xml
index d3086ca..6ee7e5a 100644
--- a/en-US/Screen_Readers.xml
+++ b/en-US/Screen_Readers.xml
@@ -6,13 +6,7 @@
<para>Screen readers are important accessibility tools that allow a person with
limited vision to have the computer read what is on the screen. There are numerous
solutions that provide this service. This section covers some of the ones available to
Fedora users.</para>
<section id="Orca">
<title>Orca for GNOME</title>
-<<<<<<< HEAD
- <para>GNOME supplies its own screen reader <package>Orca</package>.
This package is installed by default on all Fedora systems. Additional information on
<package>Orca</package> may be found by visiting <ulink
url="http://live.gnome.org/Orca/"></ulink>.</para>
- <para>To enable <package>Orca</package> you may run
<command>orca</command> from the command line. This first time you will be
asked a number of preference questions. After the initial configuration, run
<command>orca</command> a second time to start
<application>orca</application>. The graphical application which starts has
options for changing the preferences, quitting the program, and obtaining help. During the
initial setup, the questions are also said allow as they are displayed in the terminal.
</para>
- <para>Alternately, from the graphical menus select
<menuchoice><guilabel>System > Preferences > Assistive
Technologies</guilabel></menuchoice> and check the box labeled "Enable
Assistive Technologies" then click <guilabel>Preferred
Applications</guilabel> to ensure that either
<application>Orca</application> or <application>Orca and
Magnifier</application> is selected.</para>
-=======
<para>GNOME supplies its own screen reader, <package>Orca</package>.
This package is installed by default on all Fedora systems. Additional information on
<package>Orca</package> may be found by visiting <ulink
url="http://live.gnome.org/Orca/"></ulink>.</para>
->>>>>>> f13
</section>
<section id="Speakup">
<title>Speakup</title>
diff --git a/publican.cfg b/publican.cfg
index 3329347..cdb5d60 100644
--- a/publican.cfg
+++ b/publican.cfg
@@ -1,11 +1,7 @@
# Config::Simple 4.59
# Thu Aug 20 15:52:58 2009
-debug: 1
+debug: 0
xml_lang: en-US
type: Article
brand: fedora
-<<<<<<< HEAD
-=======
-
->>>>>>> f13