Merge lp:~littlergirl/kubuntu-docs/manage-software into lp:kubuntu-docs/precise

[Little Girl]

* Corrected grammar and punctuation.
* Updated the instructions for installing the alien package.

=== 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-17 08: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/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-17 08: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>