Merge lp:~littlergirl/kubuntu-docs/office into lp:kubuntu-docs/precise

[Little Girl]

* Corrected some grammar and punctuation.
* Updated some links.
* Changed all instances of oo to lo in menu references.

[Jonathan Jesse (jjesse)]

Alrighty I'm a bit confused it looks like this is yet the same merge I've already approved, and one I asked for more information about. So what exactly happened?

review: Needs Information

[Little Girl (littlergirl)]

Hey there,

> Review: Needs Information

> Alrighty I'm a bit confused it looks like this is yet the same
> merge I've already approved, and one I asked for more information
> about. So what exactly happened?

No idea. I submitted it once that I know of. If I'm doing it wrong,
hopefully you can help me figure out how I can fix it. (:

I've entered into this at a bad time with the looming March 22
Precise Pangolin deadline. Darkwing helped me to get started, but has
had other claims on his time, so I've been flying somewhat blind and
hoping not to mess anything up.

I know SVN, which helps with picking up Bazaar. I've done lots of
work with HTML and XHTML, so the XML makes sense to me, although I'm
sure I have quite a bit to learn. I'd love to have someone I could
ask when I need to know something, though. Google often gives
conflicting information. (:

Here's how I do things, so that maybe you can see where one of my
steps is gumming up the works and help me figure out how to do it
smoothly:

1) Go to this page and check what needs to be done:

 https://blueprints.launchpad.net/kubuntu-docs/+spec/desktop-p-kubuntu-docs-precise

2) Pick an .xml file to work on, edit the page, and mark that file as
INPROGRESS on that page.

3) Check that I have the latest code from Launchpad:

 bzr pull

4) Go through the .xml file and fix everything that needs to be
updated (grammar, punctuation, spelling, accuracy of information).

5) Check that the changes I made were the ones I intended to make:

 bzr diff

6) Commit the change to my local working copy:

 bzr commit --author="Little Girl <email address hidden>" -m "COMMENT" FILENAME

7) Push the commit onto Launchpad:

 bzr push lp:~littlergirl/kubuntu-docs/branchname

8) Go to Launchpad:

 https://code.launchpad.net/~

9) Log in.

10) Click the branch I just published.

11) Click the "Propose for Merging" link.

12) Paste the comment from my commit into the box (sometimes adding
to it for clarity).

13) Leave the reviewer box empty.

14) Submit it.

15) Go to this page:

 https://blueprints.launchpad.net/kubuntu-docs/+spec/desktop-p-kubuntu-docs-precise

16) Edit the page and mark the file I just pushed as DONE.

17) Repeat from step 2 or go to bed. (:

--
Little Girl

There is no spoon.

=== modified file 'docs/basics/C/basics.xml'
--- docs/basics/C/basics.xml	2011-09-14 08:01:10 +0000
+++ docs/basics/C/basics.xml	2012-03-18 02:21:19 +0000
@@ -40,19 +40,18 @@
 </para>
 </note>
 <para>
-A filesystem is a method of storing and organizing files, not only in Linux
-but also in other computer operating systems. In Linux, most files are
+A filesystem is a method of storing and organizing files &mdash; not only in 
+Linux, but also in other computer operating systems. In Linux, most files are
 <quote>regular files</quote>, except <emphasis>directories</emphasis>,
 <emphasis>special files</emphasis>, <emphasis>links</emphasis>,
 <emphasis>sockets</emphasis>, and <emphasis>named pipes</emphasis>. The most
-common filetypes that users interact with are regular files, directories and
+common filetypes that users interact with are regular files, directories, and
 links.
 </para>
 <para>
-Opening a terminal (in &kubuntu; this is
-called <application>Konsole</application>) and typing
-<screen>ls /</screen>
-brings up a list similar to the following:
+Opening a terminal (in &kubuntu; this is called 
+<application>Konsole</application>) and typing
+<screen>ls /</screen> brings up a list similar to the following:
 <screen>
 bin
 boot
@@ -114,10 +113,10 @@
 <para>
 A <abbrev>symlink</abbrev> or <quote>symbolic link</quote> to <filename
 class="directory">/media/cdrom</filename>, which itself is a
-<abbrev>symlink</abbrev> to <filename
+<abbrev>symlink</abbrev> to <filename 
 class="directory">/media/cdrom0</filename>. If a <acronym>CD</acronym> is placed
 into the <acronym>CDROM</acronym> drive, the contents of that CD will be
-available in <filename class="directory">/media/cdrom0</filename> directory.
+available in the <filename class="directory">/media/cdrom0</filename> directory.
 </para>
 </listitem>
 </varlistentry>
@@ -133,8 +132,8 @@
 <varlistentry><term><filename class="directory">etc</filename></term>
 <listitem>
 <para>
-Contains all system-related configuration files, used to control
-the operation of programs.
+Contains all system-related configuration files used to control the
+operation of programs.
 </para>
 </listitem>
 </varlistentry>
@@ -142,8 +141,8 @@
 <listitem>
 <para>
 Contains a home directory for each user on the system. A user's home directory
-can contain personal configuration files and files such as documents, music,
-video, and other user-defined directories and files.
+can contain personal configuration files, documents, music, videos, and other 
+user-defined directories and files.
 </para>
 </listitem>
 </varlistentry>
@@ -158,8 +157,8 @@
 <varlistentry><term><filename class="directory">lib</filename></term>
 <listitem>
 <para>
-Contains the kernel modules in addition to shared library images needed to boot
-the system and run commands.
+Contains the kernel modules and shared library images needed to boot the
+system and run commands.
 </para>
 </listitem>
 </varlistentry>
@@ -182,7 +181,7 @@
 <varlistentry><term><filename class="directory">lost+found</filename></term>
 <listitem>
 <para>
-Contains the results of any recovery operation due to an improper shutdown of
+Contains the results of any recovery operation due to an improper shut-down of
 the system or a system crash.
 </para>
 </listitem>
@@ -190,7 +189,7 @@
 <varlistentry><term><filename class="directory">media</filename></term>
 <listitem>
 <para>
-Contains the subdirectories which are used as mount points for removable media
+Contains the subdirectories which are used as mount points for removable media,
 such as <acronym>CDROM</acronym> drives, <acronym>USB</acronym> disks, floppy
 disks.
 </para>
@@ -200,7 +199,7 @@
 <listitem>
 <para>
 Generic mount point for filesystems or devices. In most cases, <filename
-class="directory">/media</filename> is where most devices will be automounted.
+class="directory">/media</filename> is where most devices will be auto-mounted.
 </para>
 </listitem>
 </varlistentry>
@@ -239,7 +238,7 @@
 <varlistentry><term><filename class="directory">selinux</filename></term>
 <listitem>
 <para>
-A pseudo-filesystem containing the commands used by the kernel subsystem for the
+A pseudo-filesystem containing the commands used by the kernel sub-system for the
 Security-Enhanced Linux feature.
 </para>
 </listitem>
@@ -270,7 +269,7 @@
 <listitem>
 <para>
 Contains the largest share of data on the system, including read-only user
-data, as well as files and programs and such as program binaries, documentation,
+data, as well as files and programs, such as program binaries, documentation,
 libraries, header files, and more.
 </para>
 </listitem>
@@ -278,7 +277,7 @@
 <varlistentry><term><filename class="directory">var</filename></term>
 <listitem>
 <para>
-Contains variable data such as system log files, mail and printer spool
+Contains variable data, such as system log files, mail and printer spool
 directories, as well as transient and temporary files.
 </para>
 </listitem>
@@ -300,7 +299,7 @@
 Since Linux is a true multi-user system, the principles of both
 <emphasis>users</emphasis> and <emphasis>groups</emphasis> are important to the
 internal operation of the system, and also to the day-to-day use of the system.
-Linux handling of users and groups is the reason it is one of the most secure
+The way Linux handles users and groups makes it one of the most secure
 operating systems.
 </para>
 <sect2 id="users">
@@ -319,7 +318,7 @@
 <para>
 <emphasis role="strong">Logical Users</emphasis> are not tied to a person, but
 instead are tied to a system function that are used by applications to perform
-specific tasks. Daemons, mail, news are examples of logical users.
+specific tasks. Daemons, mail, and news are examples of logical users.
 </para>
 </listitem>
 </itemizedlist>
@@ -328,9 +327,9 @@
 <title>Groups</title>
 <para>
 Groups are logical expressions of organization. They tie users together and
-provide group-based, rather than user-based permissions. Common groups
+provide group-based, rather than user-based, permissions. Common groups
 include <emphasis>admin</emphasis>,
-<emphasis>audio</emphasis>, <emphasis>mail</emphasis>.
+<emphasis>audio</emphasis>, and <emphasis>mail</emphasis>.
 </para>
 </sect2>
 </sect1>
@@ -417,8 +416,8 @@
 </entry>
 <entry>
 <emphasis role="strong">rwx</emphasis> - <emphasis>read</emphasis>,
-<emphasis>write</emphasis> and <emphasis>execute</emphasis> permissions for the
-user.
+<emphasis>write</emphasis>, and <emphasis>execute</emphasis> permissions 
+for the user.
 </entry>
 <entry>
 <emphasis role="strong">r-x</emphasis> - <emphasis>read</emphasis> and
@@ -503,7 +502,7 @@
 <listitem>
 <para>
 <keycombo><keycap>Ctrl</keycap><keycap>Esc</keycap></keycombo> - Starts
-&kde;&apos; <application>s System Activity</application> dialog where processes
+&kde;&apos;s <application>System Activity</application> dialog where processes
 can be viewed and killed.
 </para>
 </listitem>

=== modified file 'docs/contribute/C/contribute.xml'
--- docs/contribute/C/contribute.xml	2011-09-14 10:02:12 +0000
+++ docs/contribute/C/contribute.xml	2012-03-18 02:21:19 +0000
@@ -9,11 +9,11 @@
 ]>
 <article id="contribute">
 <articleinfo>
-<title>Contributing To The &kubuntu; Project</title>
+<title>Contributing To The Kubuntu Project</title>
 &legalnotice;
 <abstract>
 <para>
-This document is about how you can help Kubuntu and get involved in the community.
+This document is about how you can help &kubuntu; and get involved in the community.
 </para>
 </abstract>
 </articleinfo>
@@ -22,10 +22,12 @@
 <title>Introduction</title>
 
 <para>
-The Kubuntu community is individuals and teams working to package the software, test it, do bug triaging and then promoting Kubuntu to a wider audience. All of the software, artwork and documentation has been created, tested, 
-used and discussed openly by people around the world participating in the Open Source 
-community made possible by the Internet. So we invite you to help shape Kubuntu to better 
-meet your needs. 
+The &kubuntu; community is made up of individuals and teams working to package 
+the software, test it, triage bugs, and then promote &kubuntu; to a wider 
+audience. All of the software, artwork, and documentation has been created, 
+tested, used, and discussed openly by people around the world participating in 
+the Open Source community made possible by the Internet. We invite you to help 
+shape &kubuntu; to better meet your needs.
 </para>
 </sect1>
 
@@ -33,41 +35,53 @@
 <title> Spreading the word </title>
 
 <para>
-The easiest way to give back to the Kubuntu community is by sharing Kubuntu with others. Recommend 
-Kubuntu to others, and show them how to download and install Kubuntu, and the possibilities and 
-qualities of Open Source Software. As our community grows, it becomes more accepted and
-supported. Here are some of the steps you can take:
+The easiest way to give back to the &kubuntu; community is by sharing &kubuntu; 
+with others. Recommend &kubuntu; to others, show them how to download and 
+install it, and discuss the possibilities and qualities of Open Source Software 
+with them. As our community grows, it becomes more accepted and supported. Here 
+are some of the steps you can take:
 </para>
 <procedure>
 <step>
 <para>
-Give a talk at your local school, Linux User Group or library on Kubuntu. There are lots of 
-notes from previous talks given by others in several languages available on the wiki.
-</para>
-</step>
-<step>
-<para>
-Get CDs by downloading the iso from <ulink url="http://www.kubuntu.org/getkubuntu/download">GetKubuntu</ulink> and then burn them (or create a LiveUSB) then distribute them to people who might be interested. Drop them off at libraries, Internet Cafes, schools, computer shops or anywhere else where people use computers. Please help people to use and understand Kubuntu if they approach you for help.
-</para>
-</step>
-<step>
-<para>
-Join or start a Local Community Team and discuss the possibilities that Kubuntu brings up. If you 
-like Kubuntu it is likely that others around you will try it, and like it as well! See the "Going Local!" section for details.
+Give a talk on &kubuntu; at your local school, Linux User Group, or library. 
+There are lots of notes from previous talks given by others in several 
+languages available in the wiki.
+</para>
+</step>
+<step>
+<para>
+Get CDs by downloading the iso from <ulink 
+url="http://www.kubuntu.org/getkubuntu/download">GetKubuntu</ulink> and burning 
+it to blank CDs (or create a LiveUSB). Then distribute them to people who might 
+be interested, drop them off at libraries, Internet cafes, schools, computer 
+shops, or anywhere else where people use computers. Please help people to use 
+and understand &kubuntu; if they approach you for help.
+</para>
+</step>
+<step>
+<para>
+Join or start a Local Community Team and discuss the possibilities that 
+&kubuntu; brings up. If you like &kubuntu;, it is likely that others around you 
+will try it and like it as well!
 </para>
 </step>
 </procedure>
 </sect1>
 
 <sect1 id="loco" status="complete">
-<title> Local Teams </title>
+<title>Local Teams</title>
 
 <para>
-If you want to meet other Kubuntu users in your area, look for a Local Ubuntu Community team 
-(LoCo team for short) to join. There are LoCo teams spread out all over the world, and you can find the directory <ulink url="http://loco.ubuntu.com/">here</ulink>. If there isn't a 
-LoCo team near you, you can start a new one! Just follow the instructions <ulink url="https://wiki.ubuntu.com/LoCoTeamHowto"> on the wiki</ulink>. To get more 
-information you can join your local LoCo Team mailing list and IRC channel. Details can be found on 
-the LoCoTeam List wiki page.
+If you want to meet other &kubuntu; users in your area, look for a Local Ubuntu 
+Community team (LoCo team for short) to join. There are LoCo teams spread out 
+all over the world, and you can find the directory <ulink 
+url="http://loco.ubuntu.com/">here</ulink>. If there isn't a LoCo team near 
+you, you can start a new one! Just follow the instructions <ulink 
+url="https://wiki.ubuntu.com/LoCoTeamHowto">on the wiki</ulink>. To get more 
+information you can join your local LoCo Team mailing list and IRC channel. 
+Details can be found on the <ulink 
+url="http://loco.ubuntu.com/teams/">LoCoTeam List</ulink> wiki page.
 </para>
 </sect1>
 
@@ -75,34 +89,44 @@
 <title> Translating Kubuntu </title>
 
 <para>
-If your home language is not English but you have excellent English skills and are 
-comfortable using software in English, you help to translate the Kubuntu applications and documentation 
-into your native language. To help out:
+If your home language is not English, but you have excellent English skills 
+and are comfortable using software in English, you can help to translate the 
+&kubuntu; applications and documentation into your native language. To help 
+out:
 </para>
 <procedure>
 <step>
 <para>
-Using the web-based <ulink url="https://launchpad.net/ubuntu/+translations">Rosetta translation system</ulink> makes it easy to translate Ubuntu applications into your language. Even if you just translate a few lines you may 
-make all the difference to someone in your own country who is just starting to learn about 
+Using the web-based <ulink 
+url="https://launchpad.net/ubuntu/+translations">Rosetta translation 
+system</ulink> makes it easy to translate Ubuntu applications into your 
+language. Even if you just translate a few lines you may make all the 
+difference to someone in your own country who is just starting to learn about 
 computers and Free Software.
 </para>
 </step>
 <step>
 <para>
-Translate popular wiki pages within the <ulink url="https://help.ubuntu.com/community">Documentation Wiki</ulink>.
+Translate popular wiki pages within the <ulink 
+url="https://help.ubuntu.com/community">Documentation Wiki</ulink>.
 </para>
 </step>
 <step>
 <para>
-Test that your local language fonts and display works correctly. If they don't, file bug 
-reports on the issues. 
+Test that your local language fonts and display work correctly. If they don't, 
+file bug reports on the issues. For more information on filing bug reports, see 
+<ulink type="help" url="help:/kubuntu/bugs/">Bugs</ulink>.
 </para>
 </step>
 </procedure>
 <para>
 You can join your local LoCo Team mailing list and IRC channel (details can be 
-found on <ulink url="https://wiki.ubuntu.com/LoCoTeams"> the LoCoTeam List wiki page</ulink>) to get in touch with other users in your region so you can 
-coordinate your translation efforts. Also <ulink url="https://lists.ubuntu.com/mailman/listinfo/ubuntu-translators"> join the Ubuntu-Translators mailing list</ulink> to stay in touch with other Ubuntu translators. 
+found on the <ulink url="https://wiki.ubuntu.com/LoCoTeams">LoCoTeam</ulink> 
+wiki page) to get in touch with other users in your region so you can 
+coordinate your translation efforts. Another option is to stay in touch with 
+other Ubuntu translators by joining the <ulink 
+url="https://lists.ubuntu.com/mailman/listinfo/ubuntu-translators">Ubuntu-Translators 
+mailing list</ulink>.
 </para>
 </sect1>
 
@@ -110,33 +134,49 @@
 <title> Writing Documentation </title>
 
 <para>
-If you get stumped by a problem, chances are that others might have had it or are currently 
-experiencing it. If you are not currently able to write code to fix the problem, you can help everyone 
-else out by documenting the solution. All documentation and help pages in Kubuntu are written by 
-volunteer community members gathered in the Kubuntu Documentation Team, and you can help out in a number 
-of ways:
+If you get stumped by a problem, chances are that others might have had it or 
+are currently experiencing it. If you are not currently able to write code to 
+fix the problem, you can help everyone else out by documenting the solution. 
+All documentation and help pages in &kubuntu; are written by volunteer 
+community members gathered in the Kubuntu Documentation Team, and you can help 
+out in a number of ways:
 </para>
 <procedure>
 <step>
 <para>
-Check the existing documentation to see if it covers your problem. If it does, you can add to it, edit 
-it or remove errors (such as typos, grammar and spelling, and technical errors), and send any suggestions 
-and changes to the Documentation Team mailing list. For more information about how to help, see <ulink url="https://wiki.kubuntu.org/Kubuntu/Documentation">Kubuntu Documentation</ulink>.
-</para>
-</step>
-<step>
-<para>
-If no relevant documentation exists, you can add a page in the <ulink url="https://help.ubuntu.com/community"> Documentation Wiki</ulink> which is a separate community wiki for editing and writing documentation. Rather than answer a question two or more times, write up the answer and make it available to everyone in the wiki.
-</para>
-</step>
-<step>
-<para>
-Read through the documentation in the Ubuntu Forums and <ulink url="http://www.kubuntuforums.net/"> Kubuntuforum</ulink> and check them for accuracy, then put them in the Documentation Wiki.
+Check the existing documentation to see if it covers your problem. If it does, 
+you can add to it, edit it, or remove errors (such as typos, grammar, spelling, 
+and technical errors), and send any suggestions and changes to the 
+Documentation Team mailing list. For more information about how to help, see 
+<ulink url="https://wiki.kubuntu.org/Kubuntu/Documentation">Kubuntu 
+Documentation</ulink>.
+</para>
+</step>
+<step>
+<para>
+If no relevant documentation exists, you can add a page in the <ulink 
+url="https://help.ubuntu.com/community">Documentation Wiki</ulink>, which is a 
+separate community wiki for editing and writing documentation. Rather than 
+answer a question two or more times, write up the answer and make it available 
+to everyone in the wiki.
+</para>
+</step>
+<step>
+<para>
+Read through the documentation in the <ulink 
+url="http://ubuntuforums.org/">Ubuntu Forums</ulink> and <ulink 
+url="http://www.kubuntuforums.net/">Kubuntu Forums</ulink> and check them for 
+accuracy, then put them in the <ulink 
+url="https://help.ubuntu.com/community">Documentation Wiki</ulink>.
 </para>
 </step>
 </procedure>
 <para> 
-To get in touch with the Documentation Team you can <ulink url="http://lists.ubuntu.com/mailman/listinfo/ubuntu-doc"> join the Documentation team mailing list</ulink> and also the #ubuntu-doc IRC channel on irc.freenode.net. For Kubuntu Documentation specifically, please talk to Darkwingduck or jjesse in #kubuntu-devel, also on Freenode.
+To get in touch with the Documentation Team you can <ulink 
+url="http://lists.ubuntu.com/mailman/listinfo/ubuntu-doc">join the 
+Documentation team mailing list</ulink> and also the #ubuntu-doc IRC channel on 
+irc.freenode.net. For Kubuntu Documentation, specifically, please talk to 
+Darkwing or jjesse in #kubuntu-devel, also on irc.freenode.net.
 </para>
 </sect1>
 </article>

=== modified file 'docs/manage-software/C/manage-software.xml'
--- docs/manage-software/C/manage-software.xml	2011-09-15 09:28:29 +0000
+++ docs/manage-software/C/manage-software.xml	2012-03-18 02:21:19 +0000
@@ -68,10 +68,10 @@
 add software repositories.
 </para>
 <para>
-The software that comprises &kubuntu; is being improved continuously. With an
+The software that comprises &kubuntu; is being continuously improved. With an
 Internet connection and &kubuntu; software updating, the latest improvements and
-security fixes can be applied to a system easily. This document explains how to
-perform update. 
+security fixes can easily be applied to a system. This document explains how to
+perform updates.
 </para>
 </sect1>
 
@@ -88,58 +88,58 @@
 <para> 
 Install new software with the following steps:
 </para>
+
 <procedure>
 <step>
 <para>
-Start Muon with &menusysmuon;.
+Start <application>Muon</application> with &menusysmuon;.
 </para>
 </step>
-
 <step>
 <para>
 Search for the application with the search box and filters at the top of the
 window.
 </para>
 </step>
-
 <step>
 <para>
 The application will show up in the large white space below the search area.
 Click on the application title to be installed. 
-Click <guilabel>Install</guilabel> to start the
-installation process.
+Click <guilabel>Install</guilabel> to start the installation process.
 </para>
 </step>
-
 <step>
 <para>
-Muon might provide information about required dependencies. Acknowledge
-this information, and the required packages will begin downloading. When the
-installation process is complete, the software will be ready to use. It is
-rarely necessary to restart the system after software installation or update.
+<application>Muon</application> might provide information about required 
+dependencies. Once this information is acknowledged, the required packages will 
+begin downloading. When the installation process is complete, the software will 
+be ready to use. It is rarely necessary to restart the system after software 
+installation or updates.
 </para>
 </step>
 </procedure>
+
 <para> 
-Muon provides an easy method to remove the software that is no longer
-needed. To remove an application:
+<application>Muon</application> provides an easy method to remove the software 
+that is no longer needed. To remove an application:
 </para>
+
 <procedure>
 <step>
 <para>
-Start Muon with &menusysmuon;.
-</para>
-</step>
-
-<step>
-<para>
-Click on <guimenu>Installed Software</guimenu> and find the application you want removed.
-</para>
-</step>
-
-<step>
-<para>
-Click <guilabel>Remove</guilabel> and Muon will remove the application.
+Start <application>Muon</application> with &menusysmuon;.
+</para>
+</step>
+<step>
+<para>
+Click on <guimenu>Installed Software</guimenu> and find the application you 
+want to remove.
+</para>
+</step>
+<step>
+<para>
+Click <guilabel>Remove</guilabel> and <application>Muon</application> will 
+remove the application.
 </para>
 </step>
 </procedure>
@@ -151,7 +151,7 @@
 
 <para>
 <application><acronym>APT</acronym></application> (Advanced Packaging Tool) is a
-powerful package management system, which is the basis for the graphical
+powerful package management system which is the basis for the graphical
 <application>Software Management</application> application.
 <application>APT</application> automatically handles dependencies and performs
 other package operations that are required for package installation.
@@ -160,7 +160,7 @@
 <para>
 Running <application>APT</application> requires administrative privileges.
 Entering commands with "sudo" generates a password prompt. Several of the
-commands below will not run without sudo. 
+commands below will not run without sudo.
 </para>
 </note>
 <para>
@@ -193,7 +193,7 @@
 </listitem>
 <listitem>
 <para>
-Retrieve the current lists of available packages:
+Retrieve the current list of available packages:
 <screen>sudo apt-get update</screen>
 </para>
 </listitem>
@@ -216,7 +216,6 @@
 the comprehensive <ulink url="&debian-apt;">Debian APT User Manual</ulink>.
 </para>
 </tip>
-
 </sect1>
 
 <!-- APTITUDE -->
@@ -226,7 +225,7 @@
 <para>
 <application>Aptitude</application> is a command line front-end to
 <application>APT</application>. <application>Aptitude</application> allows
-for interactive package selection to remove, update or install packages.
+for interactive package selection to remove, update, or install packages.
 <application>Aptitude</application> is an advanced package management system,
 with more control and capability than <application>APT</application> as a
 command line tool.
@@ -239,12 +238,11 @@
 
 <para>
 Although the preferred method of installing programs is with the package
-manager, individual software
-package files can be downloaded and installed. Several kinds of package files
-are available for Linux systems. Generally, these file types are associated with
-the package managers of specific Linux distributions.
+manager, individual software package files can be downloaded and installed. 
+Several kinds of package files are available for Linux systems. Generally, 
+these file types are associated with the package managers of specific Linux 
+distributions.
 </para>
-
 <para>
 To install a particular application, it is preferable to select a &kubuntu;
 package of the application, and install it with a package manager. This ensures
@@ -272,20 +270,20 @@
 
 <sect2 id="alien" status="complete">
 <title>Convert .rpm files to .deb files</title>
-
+ 
 <para>
 Red Hat Package Manager files have the <emphasis>.rpm</emphasis>
-suffix. It is not recommended that these be installed on a &kubuntu; system. In
-almost all cases, a native &kubuntu; <emphasis>.deb</emphasis> version of
-the package is available. However, if necessary, an <emphasis>.rpm</emphasis>
-file can be converted to a <emphasis>.deb</emphasis> package using a program
-called <application>alien</application>.
+suffix. Installing these on a &kubuntu; system is not recommended. In almost 
+all cases, a native &kubuntu; <emphasis>.deb</emphasis> version of the package 
+is available. However, if necessary, an <emphasis>.rpm</emphasis> file can be 
+converted to a <emphasis>.deb</emphasis> package by using a program called 
+<application>alien</application>.
 </para>
 <procedure>
 <title>Installing Alien</title>
 <step>
 <para>
-Open <application>Software Center</application> by going to &menusysmuon;.
+Open <application>Muon</application> by going to &menumuon;.
 </para>
 </step>
 <step>
@@ -297,30 +295,35 @@
 <step>
 <para>
 Locate the package named <application>alien</application> and
-select it. Press the <guibutton>down arrow</guibutton> button. The arrow will
-change color.
-</para>
-</step>
-
-<step>
-<para>
-Press the <guibutton>Apply</guibutton> button, and
-the <guibutton>Install Now</guibutton> button on the following screen. There
-may be additional packages required to be installed as dependencies. If so,
-click <guibutton>OK</guibutton>.
-</para>
-</step>
-
+select it. Press the <guibutton>Installation</guibutton> button near the 
+bottom right of the window.
+</para>
+<note>
+<para>
+The text in the <emphasis>Requested</emphasis> column will turn green and 
+change from <quote>No Change</quote> to <quote>Install</quote>.
+</para>
+</note>
+</step>
+<step>
+<para>
+Additional packages may be required as dependencies. If so, a list will be 
+displayed. Click the <guibutton>OK</guibutton> button to mark them for 
+installation.
+</step>
+<step>
+<para>
+Press the <guibutton>Apply Changes</guibutton> button in the toolbar.
+</para>
+</step>
 <step>
 <para>
 If prompted, enter the proper password and press <guibutton>OK</guibutton>.
 </para>
 </step>
-
 <step>
 <para>
-Once the installation has completed, close <application>Software
-Management</application>.
+Once the installation has completed, close <application>Muon</application>.
 </para>
 </step>
 </procedure>
@@ -334,13 +337,14 @@
 <step>
 <para>
 At the command prompt, type <userinput>sudo alien package_file.rpm</userinput>
-and press the <keycap>Enter</keycap> key.
+and press the <keycap>Enter</keycap> key to create a <emphasis>.deb</emphasis> 
+file in the same directory.
 </para>
 </step>
 <step>
 <para>
 For more information on <application>alien</application>, type <userinput>man
-alien</userinput> at the command prompt. When complete, press
+alien</userinput> at the command prompt. When finished, press 
 <keycap>q</keycap> to exit.
 </para>
 </step>
@@ -353,12 +357,12 @@
 <para>
 Files with the <emphasis>.tar.gz</emphasis> or <emphasis>.tar.bz2</emphasis>
 suffix are package files known as <emphasis>tarballs</emphasis> or
-<emphasis>source</emphasis> packages which are widely used in Linux. If there is
-no native &kubuntu; package available in any of the repositories, it may be
+<emphasis>source</emphasis> packages. These are widely used in Linux. If there 
+is no native &kubuntu; package available in any of the repositories, it may be
 possible to compile and install the package from source. For tips on compiling
-software, look at the <ulink
-url="https://wiki.ubuntu.com/CompilingSoftware">Compiling
-Software</ulink> page on the Ubuntu Wiki.
+software, look at the <ulink 
+url="https://wiki.ubuntu.com/CompilingSoftware">Compiling Software</ulink> page 
+in the Ubuntu Wiki.
 </para>
 </sect2>
 </sect1>
@@ -371,12 +375,12 @@
 <title>What are Repositories?</title>
 
 <para>
-Thousands of programs are freely available to install on &kubuntu;. These
+Thousands of programs are freely available to install in &kubuntu;. These
 programs are stored in software archives (<emphasis>repositories</emphasis>) and
 are made available for installation over the Internet. This makes it easy
-to install new programs in &kubuntu;. It is also secure, because each
-program is built specifically for &kubuntu; and is checked thoroughly before it
-is installed. &kubuntu; repositories are categorized into four groups:
+to install new programs in &kubuntu;. It is also secure, because each program 
+is built specifically for &kubuntu; and is checked thoroughly before it is 
+installed. &kubuntu; repositories are categorized into four groups:
 </para>
 
 <itemizedlist>
@@ -391,13 +395,13 @@
 <itemizedlist>
 <listitem>
 <para>
-The level of support that software development teams provide for a program
+The level of support that software development teams provide for a program.
 </para>
 </listitem>
 <listitem>
 <para>
 The level of compliance the program has to the <ulink
-url="&ubuntu-philosophy;">Free Software Philosophy</ulink>
+url="&ubuntu-philosophy;">Free Software Philosophy</ulink>.
 </para>
 </listitem>
 </itemizedlist>
@@ -411,7 +415,7 @@
 a system has information about the Internet-based locations for these
 repositories, more programs are available for installation. Using the
 software package management tools installed by default, it is possible to
-discover, install and update any piece of software directly over the Internet,
+discover, install, and update any piece of software directly over the Internet 
 without the need for the LiveCD.
 </para>
 </sect2>
@@ -431,7 +435,7 @@
 <guimenu>Settings</guimenu>
 <guimenuitem>Configure Software Sources</guimenuitem>
 </menuchoice>
- in the <application>Software Center</application> package manager window.
+ in the <application>Muon</application> package manager window.
 </para>
 </step>
 <step>
@@ -439,13 +443,12 @@
 An administrative password is required in order to proceed. 
 </para>
 </step>
-
 <step>
 <para>
 Next, click on the <guilabel>Other Software</guilabel> tab. Existing
 repositories can be enabled or disabled by checking the appropriate boxes
-in the upper section. To add a new repository, click the
-<guilabel>Add</guilabel> button.
+in the upper section. To add a new repository, click the 
+<guilabel>Add...</guilabel> button.
 </para>
 </step>
 
@@ -453,24 +456,41 @@
 <para>
 Enter the repository address. The proper format is required, and looks similar
 to this: 
-<screen>deb http://ppa.launchpad.net/kubuntu-ppa/backports/ubuntu
-oneiric main</screen>
-</para>
-</step>
-
-<step>
-<para>
-After adding the repository, a prompt will appear to update the package list.
-This will allow Muon to find the newly available software.
-</para>
+<screen>deb http://ppa.launchpad.net/kubuntu-ppa/backports/ubuntu oneiric 
+main</screen>
+</para>
+</step>
+
+<step>
+<para>
+Click the <guilabel>OK</guilabel> button to add the repository.
+</para>
+</step>
+
+<step>
+<para>
+Click the <guilabel>Close</guilabel> button.
+</para>
+<note>
+<para>
+A prompt will appear to update the package list. Doing so will allow 
+<application>Muon</application> to find the newly available software.
+</para>
+</note>
 </step>
 
 <step>
 <para>
 To remove a repository, select it in <guilabel>Software Sources</guilabel>, and
-press the <guibutton>Remove</guibutton> button. When the process is
-complete, press the <guibutton>Close</guibutton> button.
-</para>
+press the <guibutton>Remove</guibutton> button. When the process is complete, 
+press the <guibutton>Close</guibutton> button.
+</para>
+<note>
+<para>
+A prompt will appear to update the package list. Doing so will make 
+<application>Muon</application> forget the no longer available software.
+</para>
+</note>
 </step>
 </procedure>
 </sect2>
@@ -488,9 +508,9 @@
 <para>
 When updates become available, &kubuntu; will display a message in the System
 Tray. To update the system, click the <guibutton>Review and Update</guibutton>
-button, which will open Muon. Click <guibutton>Select All
-Updates</guibutton> and then <guibutton>Apply</guibutton>. &kubuntu; will
-download and install the updates.
+button, which will open <application>Muon</application>. Click 
+<guibutton>Select All Updates</guibutton> and then <guibutton>Apply</guibutton>. 
+&kubuntu; will download and install the updates.
 </para>
 
 <para>

=== modified file 'docs/office/C/office.xml'
--- docs/office/C/office.xml	2011-01-25 03:01:24 +0000
+++ docs/office/C/office.xml	2012-03-18 02:21:19 +0000
@@ -12,7 +12,8 @@
 <title>Office and Productivity</title>
 &legalnotice;
 <abstract>
-<para>This document contains information on the installed and available Office
+<para>
+This document contains information on the installed and available Office
 applications for &kubuntu;.
 </para>
 </abstract>
@@ -22,48 +23,55 @@
 <title>Introduction</title>
 
 <para>
-The default office application in &kubuntu; is LibreOffice.  This office
-suite includes Writer, Calc, Draw, Impress and Math. This suite is the
-open source equivalent of the Microsoft Office suite, and each application
-corresponds to a similar product in that line. Calc is similar to Excel, Writer
-is like Word, Impress is similar to PowerPoint, Base and Access have similar
-functions. LibreOffice applications work well with the files created by their
-Microsoft counterparts, with the exception of Microsoft Access files.</para>
-
-<para>All of these applications are installed by default. &kubuntu; has renamed
-the titles listed in the <application>Kickoff Application Launcher</application>
-to reflect how the applications are used.  For more information, visit the
-LibreOffice suite, found at <ulink
+The default office application in &kubuntu; is LibreOffice. It includes Calc, 
+Draw, Impress, Math, and Writer. This suite is the open source equivalent of 
+the <trademark>Microsoft Office</trademark> suite, and each application 
+corresponds to a similar product in that line. Calc is similar to 
+<trademark>Excel</trademark>, Writer is like <trademark>Word</trademark>, 
+Impress is similar to <trademark>PowerPoint</trademark>, Base and 
+<trademark>Access</trademark> have similar functions. LibreOffice 
+applications work well with the files created by their 
+<trademark>Microsoft</trademark> counterparts, with the exception of 
+<trademark>Microsoft Access</trademark> files.
+</para>
+<para>
+All of these applications (except for Base) are installed by default. &kubuntu; 
+has renamed the titles listed in the <application>Kickoff Application 
+Launcher</application> to reflect how the applications are used.  For more 
+information, visit the LibreOffice suite at <ulink 
 url="http://www.libreoffice.org">LibreOffice</ulink>.
 </para>
-
 <orderedlist>
 <listitem>
-<para>LibreOffice Impress (Presentation) can be used to create
-presentations.  Most PowerPoint files may be opened flawlessly in Impress. 
-LibreOffice Impress can be launched by going to &menuooimpress;.</para>
-</listitem>
-
-<listitem>
-<para>LibreOffice Calc (Spreadsheets) is a full-featured spreadsheet
-program. Calc supports multiple spreadsheets, built-in functions, and can read
-and write most Microsoft Excel formats.  LibreOffice Calc can be launched by
-going to &menuoocalc;.</para>
-</listitem>
-
-<listitem>
-<para>LibreOffice Writer (Word Processor) is a full-featured word processor
-that can create simple or complex documents. Writer can be launched by going to
-&menuoowriter;.</para>
-</listitem>
-
-<listitem>
-<para>LibreOffice Draw provides complex functionality to create drawings,
-diagrams, charts and other business graphics. The application is object-oriented
-and allows for layering of various panes of work. Draw can be launched from
-within any other LibreOffice application or by pressing
-<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> and
-typing <userinput>oodraw</userinput> and pressing the <guibutton>Ok</guibutton>
+<para>
+LibreOffice Impress (Presentation) can be used to create presentations. 
+Most <trademark>PowerPoint</trademark> files can be opened flawlessly in 
+Impress. LibreOffice Impress can be launched by going to &menuloimpress;.
+</para>
+</listitem>
+<listitem>
+<para>
+LibreOffice Calc (Spreadsheets) is a full-featured spreadsheet program. Calc 
+supports multiple spreadsheets, built-in functions, and can read and write most 
+<trademark>Microsoft Excel</trademark> formats.  LibreOffice Calc can be 
+launched by going to &menulocalc;.
+</para>
+</listitem>
+<listitem>
+<para>
+LibreOffice Writer (Word Processor) is a full-featured word processor that can 
+create simple or complex documents. Writer can be launched by going to
+&menulowriter;.
+</para>
+</listitem>
+<listitem>
+<para>
+LibreOffice Draw provides complex functionality to create drawings, diagrams, 
+charts and other business graphics. The application is object-oriented and 
+allows for layering of various panes of work. Draw can be launched from within 
+any other LibreOffice application, by going to &menulodraw;, or by pressing 
+<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo> and typing 
+<userinput>lodraw</userinput> and pressing the <guibutton>Ok</guibutton>
 button.
 </para>
 </listitem>
@@ -74,29 +82,36 @@
 <sect1 id="database" status="needs review">
 <title>Database Application</title>
 
-<para>&kubuntu; does not ship with a default database application. However
-there are options to choose from.
+<para>
+&kubuntu; does not ship with a default database application. However, there are 
+options to choose from.
 <itemizedlist>
 <listitem>
-<para><application>LibreOffice Base</application> is the database that is a
-part of the LibreOffice suite.
-<application>Base</application> is in the <emphasis>Main</emphasis> repository. 
-Please refer to the 
-<ulink type="help" url="help:kubuntu/add-applications">Adding
-Applications</ulink> documentation for help on installation.</para>
+<para>
+<application>LibreOffice Base</application> is the database that is a part of 
+the LibreOffice suite. <application>Base</application> is in the 
+<emphasis>Main</emphasis> repository. Please refer to the <ulink 
+type="help" url="help:kubuntu/manage-software">Software Management In 
+&kubuntu;</ulink> documentation for help with installation.
+</para>
 </listitem>
-
 <listitem>
-<para><application>Kexi</application> is another choice for a database
-application. Kexi is part of the KDE <application>KOffice</application>
-suite and tends to integrate better within KDE. <application>Kexi</application>
-is in the <emphasis>Main</emphasis> repository.  Please refer to the
-<ulink type="help" url="help:/kubuntu/add-applications">Adding
-Applications</ulink> documentation for help on installation.</para>
+<para>
+<application>Kexi</application> is another choice for a database application. 
+Kexi is part of the KDE <application>KOffice</application> suite and tends to 
+integrate better within KDE. <application>Kexi</application> is in the 
+<emphasis>Main</emphasis> repository. Please refer to the <ulink type="help" 
+url="help:kubuntu/manage-software">Software Management In &kubuntu;</ulink> 
+documentation for help with installation.
+</para>
 </listitem>
 </itemizedlist>
-It is recommended to try both database applications in order to see which works
-best in a given situation.</para>
+<note>
+<para>
+It is recommended to try both database applications in order to see which works 
+best in a given situation.
+</para>
+</note>
 </sect1>
 
 </article>

=== modified file 'docs/support/C/support.xml'
--- docs/support/C/support.xml	2010-03-26 06:26:38 +0000
+++ docs/support/C/support.xml	2012-03-18 02:21:19 +0000
@@ -13,8 +13,7 @@
 &legalnotice;
 <abstract>
 <para>
-This document explains how to obtain extra help with a
-Kubuntu desktop system.
+This document explains how to obtain extra help with a Kubuntu desktop system.
 </para>
 </abstract>
 </articleinfo>
@@ -23,15 +22,15 @@
 <title>Application Help</title>
 
 <para>
-The easiest way to find help about an application is to read its handbook, which
+The easiest way to find help on an application is to read its handbook, which
 is accessible from the <emphasis>Help</emphasis> menu in the application's
-toolbar. 
+toolbar.
 </para>
 <para>
 <acronym>KDE</acronym> also offers extra documentation on all the software
 shipped with it. This documentation can be accessed through their <ulink
 url="http://www.kde.org/documentation/">website</ulink> and is also present on
-a &kubuntu; system in <application>KHelpCenter</application>.
+a &kubuntu; system in the <application>KHelpCenter</application>.
 </para>
 </sect1>
 
@@ -39,12 +38,12 @@
 <title><acronym>KDE</acronym> Help Center</title>
 
 <para>
-The <acronym>KDE</acronym> help system known as
-<application>KHelpCenter</application> is included with &kubuntu;. To
-access <application>KHelpCenter</application>, go to &menuhelp;. From there,
-search within the system's man pages or within the system documentation created
-by the &kubuntu; and <acronym>KDE</acronym> documenters. The main page is a
-simple menu layout that provides access to the needed help.
+The <acronym>KDE</acronym> help system known as the 
+<application>KHelpCenter</application> is included with &kubuntu;. To access 
+<application>KHelpCenter</application>, go to &menuhelp;. From there, search 
+within the system's man pages or within the system documentation created by the 
+&kubuntu; and <acronym>KDE</acronym> documenters. The main page is a simple 
+menu layout that provides access to the needed help.
 </para>
 </sect1>
 	
@@ -59,29 +58,29 @@
 <itemizedlist>
 <listitem>
 <para>
-<ulink url="http://help.ubuntu.com/">The Ubuntu Documentation Website</ulink>
+The <ulink url="http://help.ubuntu.com/">Ubuntu Documentation Website</ulink>
 contains HTML and PDF versions of this guide, and other guides produced by the
 Ubuntu Documentation Team for Ubuntu and Kubuntu.
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="https://help.ubuntu.com/community">Ubuntu Community Documentation
-Wiki</ulink> - this contains many other community maintained guides.
+The <ulink url="https://help.ubuntu.com/community">Ubuntu Community 
+Documentation Wiki</ulink> contains many other community-maintained guides.
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="http://www.kubuntuforums.net/">Kubuntu</ulink> and <ulink
-url="http://ubuntuforums.org/">Ubuntu</ulink> Community Forums - for asking
+The <ulink url="http://www.kubuntuforums.net/">Kubuntu</ulink> and <ulink
+url="http://ubuntuforums.org/">Ubuntu</ulink> Community Forums are for asking
 questions and getting answers from the forum community.
 </para>
 </listitem>
 <listitem>
 <para>
 Much software in Kubuntu is provided by <acronym>KDE</acronym>, so it is useful
-to ask for help on <ulink
-url="http://forum.kde.org/index.php"><acronym>KDE</acronym> forums</ulink>
+to ask for help on the <ulink 
+url="http://forum.kde.org/index.php"><acronym>KDE</acronym> forums</ulink>.
 </para>
 </listitem>
 <listitem>
@@ -92,14 +91,14 @@
 </listitem>
 <listitem>
 <para>
-IRC chat: <phrase>&kubuntu-irc;</phrase> - chat in realtime with the
-&kubuntu; community.
+The irc.freenode.net <phrase>&kubuntu-irc;</phrase> IRC channel offers a way to 
+chat in realtime with other members of the &kubuntu; community.
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="http://kubuntu.org">Kubuntu Homepage</ulink> - Get the latest news
-about &kubuntu;.
+The <ulink url="http://kubuntu.org">Kubuntu Homepage</ulink> gives you the 
+latest news about &kubuntu;.
 </para>
 </listitem>
 </itemizedlist>