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

[Little Girl]

* Added an entity.
* Added some tags.
* Fixed some grammar.
* Fixed some punctuation.

=== modified file 'docs/audio/C/audio.xml'
--- docs/audio/C/audio.xml	2011-12-30 16:40:04 +0000
+++ docs/audio/C/audio.xml	2012-03-22 07:41:34 +0000
@@ -22,20 +22,20 @@
 <title>Playing CDs</title>
 <para>
 <application>Amarok</application> is the default application for playing audio
-<acronym>CDs</acronym> in &kubuntu;. When a <acronym>CD</acronym> is inserted,
+<acronym>CD</acronym>s in &kubuntu;. When a <acronym>CD</acronym> is inserted,
 &kubuntu; will recognize it and display default options. To hear the content
 with <application>Amarok</application>, select <guilabel>Play Audio CD with
 Amarok</guilabel> and then press the <guibutton>OK</guibutton> button.
 &kubuntu; can be configured to remember this choice every time
 a <acronym>CD</acronym> is inserted by selecting <guilabel>Always do
 this for this type of media</guilabel>, and pressing <guibutton>OK</guibutton>.
-<application>Amarok</application> also offers other useful features. If connected to
-the Internet, <application>Amarok</application> will retrieve
+<application>Amarok</application> also offers other useful features. If 
+connected to the Internet, <application>Amarok</application> will retrieve
 <acronym>CD</acronym> artist, title, and track data from <ulink
 url="http://freedb.org">freedb.org</ulink>. It will also download the lyrics
-for the current selection if they are available by choosing the
-<guilabel>Lyrics</guilabel> tab. Other Artist information can be found on <ulink
-url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
+for the current selection &mdash; if they are available &mdash; by choosing the
+<guilabel>Lyrics</guilabel> tab. Other artist information can be found on 
+<ulink url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
 <guilabel>Artist</guilabel> tab.
 </para>
 </sect1>
@@ -44,19 +44,21 @@
 <title>Editing Audio </title>
 
 <para>
-For editing audio files, &kubuntu; provides <application>Sound Editor (Audacity)</application>,
-a full-featured, free and open source software application. To use
-<application>Sound Editor (Audacity)</application>:
+For editing audio files, &kubuntu; provides <application>Sound Editor 
+(Audacity)</application>, a full-featured, free, and open source software 
+application. To use <application>Sound Editor (Audacity)</application>:
 </para>
 <procedure>
 <step>
 <para>
-Install <application>Sound Editor (Audacity)</application> from the package manager (Muon)
+Install <application>Sound Editor (Audacity)</application> from the package 
+manager (Muon).
 </para>
 </step>
 <step>
 <para>
-Run <application>Sound Editor (Audacity)</application> by going to &menuaudacity;.
+Run <application>Sound Editor (Audacity)</application> by going to 
+&menuaudacity;.
 </para>
 </step>
 <step>
@@ -64,8 +66,7 @@
 Detailed instructions (including tutorials and weblinks) on using
 <application>Sound Editor (Audacity)</application> can be found by going to
 <menuchoice>
-<guimenu>Help</guimenu>
-<guisubmenu>Contents</guisubmenu>
+<guimenu>Help</guimenu> <guisubmenu>Contents</guisubmenu>
 </menuchoice> from within <application>Sound Editor (Audacity)</application>.
 </para>
 </step>
@@ -78,7 +79,7 @@
 <para>
 In addition to being the default music player in &kubuntu;,
 <application>Amarok</application> is also helpful for managing music
-collections.  Start <application>Amarok</application> by going to &menuamarok;.
+collections. Start <application>Amarok</application> by going to &menuamarok;.
 </para>
 <para>
 Another useful <application>Amarok</application> feature is the built-in ID3
@@ -93,10 +94,11 @@
 
 <para>
 Another exciting <application>Amarok</application> feature is the ability to
-play music directly from an iPod or other portable device. <application>Amarok</application> can also be
-used to transfer music files to and from an iPod. Please refer to the <ulink
-type="help" url="help:/amarok">Amarok Handbook</ulink> for more information on
-transferring and managing iPod media files.
+play music directly from an iPod or other portable device. 
+<application>Amarok</application> can also be used to transfer music files to 
+and from an iPod. Please refer to the <ulink type="help" 
+url="help:/amarok">Amarok Handbook</ulink> for more information on transferring 
+and managing iPod media files.
 </para>
 </sect1>
 
@@ -105,30 +107,29 @@
 <procedure>
 <step>
 <para>
-When a blank <acronym>CD</acronym> is inserted, &kubuntu; will
-recognize it, mount it, and then ask what to do with the <acronym>CD</acronym>.
-Choose <guilabel>Create an audio CD with K3B</guilabel> and press
-<guibutton>OK</guibutton>. This will open
-<application>K3b</application>, the <acronym>CD</acronym> and
-<acronym>DVD</acronym> Kreator, and provide various options.
+When a blank <acronym>CD</acronym> is inserted, &kubuntu; will recognize it, 
+mount it, and then ask what to do with the <acronym>CD</acronym>. Choose 
+<guilabel>Create an audio CD with K3B</guilabel> and press 
+<guibutton>OK</guibutton>. This will open the <application>K3b</application> 
+<acronym>CD</acronym> and <acronym>DVD</acronym> creator, and provide various 
+options.
 </para>
 </step>
 <step>
 <para>
-To start <application>K3b</application> manually, go to <guilabel>Kickoff Application 
-> Applications > Multimedia > </guilabel><application>Disk Burning (K3b)</application>.
+To start <application>K3b</application> manually, go to &menuk3b;.
 </para>
 </step>
 <step>
 <para>
 Select <guilabel>New Audio CD Project</guilabel> in the <guilabel>New
-Project</guilabel> dropdown menu. 
+Project</guilabel> drop-down menu. 
 </para>
 </step>
 <step>
 <para>
 Inside <application>K3b</application>, browse and select the tracks to be
-ripped. Then drag and drop the tracks in the white area at the bottom of the
+ripped. Then drag and drop the tracks into the white area at the bottom of the
 <application>K3b</application> window. 
 <mediaobject>
 <imageobject>
@@ -154,9 +155,10 @@
 <itemizedlist>
 <listitem>
 <para>
-<guilabel>Writing</guilabel> - provides choices related to burning an image from
-the files selected in the previous step.
-<note><title>No MP3 Support by Default</title>
+<guilabel>Writing</guilabel> - provides choices related to burning an image 
+from the files selected in the previous step.
+<note>
+<title>No MP3 Support by Default</title>
 <para>
 <acronym>MP3</acronym> is a protocol restricted by patents. In order to use it
 with <application>K3b</application>, please refer to the information at the end
@@ -194,36 +196,36 @@
 </step>
 </procedure>
 <para>
-<application>K3b</application> can extract audio files to the following formats:
+<application>K3b</application> can extract audio files to the following 
+formats:
 <itemizedlist>
 <listitem>
 <para>
-<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg
-Vorbis is a patent-free lossy audio compression format which usually produces
-higher quality and greater compression than MP3. See the <ulink
-url="http://www.vorbis.com/faq/">Vorbis website</ulink> for more information.
+<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg Vorbis is a patent-free 
+lossy audio compression format which usually produces higher quality and 
+greater compression than MP3. See the <ulink url="http://www.vorbis.com/faq/">
+Vorbis website</ulink> for more information.
 </para>
 </listitem>
 <listitem>
 <para><emphasis role="strong">FLAC</emphasis> - The Free Lossless Audio
-Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without removing
-any information from the audio stream. For more information on this format, see
-the <ulink url="http://flac.sourceforge.net/">FLAC homepage</ulink> on
-sourceforge.net.
+Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without 
+removing any information from the audio stream. For more information on this 
+format, see the <ulink url="http://flac.sourceforge.net/">FLAC 
+homepage</ulink> on <trademark>Sourceforge</trademark>.
 </para>
 </listitem>
 <listitem>
-<para><emphasis role="strong">WAV</emphasis> - Wav is an
-uncompressed audio format that can be compressed into OGG Vorbis or a codec of
-your choice. It is often edited in applications such as Audacity before being
-compressed.
+<para><emphasis role="strong">WAV</emphasis> - Wav is an uncompressed audio 
+format that can be compressed into OGG Vorbis or a codec of your choice. It is 
+often edited in applications such as Audacity before being compressed.
 </para>
 </listitem>
 </itemizedlist>
 </para>
 <para>
 CD audio files can be extracted to the proprietary, non-free
-<emphasis role="strong">MP3</emphasis> lossy format by using the
+<emphasis role="strong">MP3</emphasis> lossy format by using the 
 <application>lame</application> encoder. Please refer to the <ulink type="help"
 url="help:/kubuntu/add-applications/">Adding Applications</ulink> documentation
 for help with installing applications such as <application>lame</application>.
 
=== modified file 'docs/bugs/C/bugs.xml'
--- docs/bugs/C/bugs.xml	2011-09-15 05:13:39 +0000
+++ docs/bugs/C/bugs.xml	2012-03-22 07:41:34 +0000
@@ -28,8 +28,8 @@
 <varlistentry><term>Crash</term>
 <listitem>
 <para>
-An application or system crash or failure. Most of the time, a crash dialog will
-be presented that can be turned into a bug report.
+An application or system crash or failure. Most of the time a crash dialog will
+be presented. This can be turned into a bug report.
 </para>
 </listitem>
 </varlistentry>
@@ -59,19 +59,25 @@
 <title>KDE's Bug Tracking System</title>
 <para><ulink url="https://bugs.kde.org/"/></para>
 <para>
-KDE uses Bugzilla, a &quot;Defect Tracking System&quot;. Bugzilla is one of the
-most popular tools used in the open source development community.
+<trademark>KDE</trademark> uses <trademark>Bugzilla</trademark>, a 
+<quote>Defect Tracking System</quote>. <trademark>Bugzilla</trademark> is one 
+of  the most popular tools used in the open source development community.
 </para>
 <note><title>Register first</title>
 <para>
-To report a bug, one must register for an account on KDE's Bugzilla
-at <ulink url="https://bugs.kde.org/createaccount.cgi"/>. A valid email address
-is required for registration.
+To report a bug, one must register for an account on 
+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark> at <ulink 
+url="https://bugs.kde.org/createaccount.cgi"/>. A valid email address is 
+required for registration.
 </para>
 </note>
 <note><title>Only for KDE bugs</title>
 <para>
-Bugzilla is only for KDE bugs. If the application is not part of KDE, for instance Firefox, LibreOffice, or VLC, then the report should be filed in Launchpad instead. Please see the next section, which covers filing reports concerning Launchpad.
+<trademark>Bugzilla</trademark> is only for <trademark>KDE</trademark> bugs. If 
+the application is not part of <trademark>KDE</trademark> &mdash; Firefox, 
+LibreOffice, or VLC, for instance &mdash; then the report should be filed in 
+Launchpad instead. Please see the next section, which covers filing reports 
+concerning Launchpad.
 </para>
 </note>
 </sect2>
@@ -79,22 +85,24 @@
 <title>Launchpad</title>
 <para><ulink url="https://launchpad.net/"/></para>
 <para>
-Launchpad is an open source suite of tools that help people and teams to work
-together on software projects. Launchpad is used by the Ubuntu and &kubuntu;
-Projects, as well as various other open source projects.
+<trademark>Launchpad</trademark> is an open source suite of tools that help 
+people and teams to work together on software projects. Launchpad is used by 
+the &ubuntu; and &kubuntu; projects, as well as various other open source 
+projects.
 </para>
 <note><title>Register first</title>
 <para>
-To report a bug, one must register for a Launchpad account at
-<ulink url="https://launchpad.net/+login"/>. A valid email address is required
-for registration.
+To report a bug, one must register for a <trademark>Launchpad</trademark> 
+account at <ulink url="https://launchpad.net/+login"/>. A valid email address 
+is required for registration.
 </para>
 </note>
 <note><title>For any bug in &kubuntu;</title>
 <para>
-Launchpad can be used to file a bug report for any application available in the
-Ubuntu or &kubuntu; repositories. For KDE applications, the
-KDE Bug Tracking system (above) is preferred.
+<trademark>Launchpad</trademark> can be used to file a bug report for any 
+application available in the &ubuntu; or &kubuntu; repositories. For 
+<trademark>KDE</trademark> applications, the <trademark>KDE Bug 
+Tracking</trademark> system (above) is preferred.
 </para>
 </note>
 </sect2>
@@ -104,18 +112,19 @@
 <title>Filing a Crash Report</title>
 <para>
 When an application crashes in &kubuntu;, the appropriate crash dialog will
-appear. It is usually easy to file a bug report from the dialog. With a KDE
-application, the KDE crash dialog will appear along with instructions
-for reporting the bug. Otherwise, the Ubuntu crash dialog will appear with
-instructions for filing a bug on Launchpad.
+appear. It is usually easy to file a bug report from the dialog. With a 
+<trademark>KDE</trademark> application, the <trademark>KDE</trademark> crash 
+dialog will appear along with instructions for reporting the bug. Otherwise, 
+the &ubuntu; crash dialog will appear with instructions for filing a bug on 
+<trademark>Launchpad</trademark>.
 </para>
 <sect2 id="filing-crash-kde">
 <title>KDE</title>
 <para>
-When an application crashes in KDE, a crash dialog will be presented that is
-similar to the following images. The first image shows the
-<guilabel>General</guilabel> tab which provides an overview of the crash. The
-second image shows the <guilabel>Developer Information</guilabel> tab which
+When an application crashes in <trademark>KDE</trademark>, a crash dialog will 
+be presented that is similar to the following images. The first image shows the
+<guilabel>General</guilabel> tab, which provides an overview of the crash. The
+second image shows the <guilabel>Developer Information</guilabel> tab, which
 provides trace information that is useful to developers.
 </para>
 <para>
@@ -139,10 +148,10 @@
 </example>
 </para>
 <para>
-If the trace information is deemed valuable, filing a bug report is
-easy with the crash dialog wizard. If the trace is not deemed valuable, then it
-is not possible to file a bug report with the wizard. The bug report can still
-be filed manually at <ulink url="https://bugs.kde.org/"/>.
+If the trace information is deemed valuable, filing a bug report is easy with 
+the crash dialog wizard. If the trace is not deemed valuable, then it is not 
+possible to file a bug report with the wizard. The bug report can still be 
+filed manually at <ulink url="https://bugs.kde.org/"/>.
 </para>
 <para>
 To complete the bug reporting process, follow the procedure below.
@@ -151,14 +160,15 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Report Bug</guibutton> button.
-The following dialog will appear.
+The following dialog will appear:
 </para>
 <para>
 <example>
 <title>Welcome to the Reporting Assistant</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_welcome.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_welcome.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -167,14 +177,15 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Next</guibutton> button. The
-following dialog will appear.
+following dialog will appear:
 </para>
 <para>
 <example>
 <title>What do you know about the crash?</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_about_crash.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_about_crash.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -183,15 +194,17 @@
 <step>
 <para>
 Select the applicable options. The drop-down box under the question,
-&quot;<guilabel>Does the application crash again if you repeat the
-same situation?</guilabel>&quot; has several options.
+<quote><guilabel>Does the application crash again if you repeat the
+same situation?</guilabel></quote> has several options.
 </para>
 <para>
 <example>
 <title>Does the application crash again if you repeat the same situation?</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_about_crash_dropdown.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_about_crash_dropdown.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -205,18 +218,21 @@
 </step>
 <step>
 <para>
-Depending on the information available in the crash report, either of two
+Depending on the information available in the crash report, either of two 
 dialogs will appear. One is a dialog that indicates that there is not enough
 information to file a good report. The other is a dialog indicating that the
-information is useful, and that it would be helpful to continue with filing the
+information is useful and that it would be helpful to continue with filing the
 report.
 </para>
 <para>
 <example>
-<title>Not enough information for developers to continue the reporting process</title>
+<title>Not enough information for developers to continue the reporting 
+process</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_not_enough_info.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_not_enough_info.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -226,7 +242,9 @@
 <title>This crash information is useful</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_useful_information.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_useful_information.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -235,7 +253,7 @@
 <para>
 It may be necessary to install the proper debug packages in order to get a good
 trace. Such packages include <filename>kdebase-dbg</filename>,
-<filename>kdebase-workspace-dbg</filename>,
+<filename>kdebase-workspace-dbg</filename>, and 
 <filename>kdebase-runtime-dbg</filename>.
 </para>
 </note>
@@ -243,36 +261,42 @@
 <step>
 <para>
 If enough information was provided to continue filing a bug report using
-the assistant, a dialog will appear to allow logging in to KDE's Bugzilla.
+the assistant, a dialog will appear to allow logging in to 
+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark>.
 </para>
 <para>
 <example>
 <title>KDE Bug Tracking System Login</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_bugtracker_login.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_bugtracker_login.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
 </para>
 <note><title>Use e-mail address as username</title>
 <para>
-Use the e-mail address that was used to register with KDE's Bugzilla.
+Use the email address that was used to register with 
+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark>.
 </para>
 </note>
 </step>
 <step>
 <para>
-After logging in with username (e-mail address) and password,
+After logging in with your username (email address) and password, 
 <mousebutton>click</mousebutton> the <guibutton>Login</guibutton> button. The
-assistant will check for duplicates and display the following dialog.
+assistant will check for duplicates and display the following dialog:
 </para>
 <para>
 <example>
 <title>Bug Report Possible Duplicates List</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_possible_duplicates.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_possible_duplicates.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -283,14 +307,17 @@
 If there is a possible duplicate report, <mousebutton>click</mousebutton> the
 report in the list and then <mousebutton>click</mousebutton> the <guibutton>Open
 selected report</guibutton> button. Either of the following dialogs will be
-presented.
+presented:
 </para>
 <para>
 <example>
-<title>The report you selected is already marked as a duplicate of bug...</title>
+<title>The report you selected is already marked as a duplicate of 
+bug...</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_nested_duplicate_detected.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_nested_duplicate_detected.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -300,7 +327,9 @@
 <title>Showing the duplicate bug report you selected</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_duplicate_report.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_duplicate_report.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -313,23 +342,26 @@
 bug report and inform the developers that it may be a duplicate. This is
 recommended, except in cases with experienced users where it is clearly not a
 duplicate. <mousebutton>Clicking</mousebutton> the <guibutton>Attach to this
-report (Advanced)</guibutton> will attach the crash information to the report.
+report (Advanced)</guibutton> button will attach the crash information to the 
+report.
 </para>
 <para>
 If the bug is not a duplicate, simply <mousebutton>click</mousebutton>
-the <guibutton>Next</guibutton> in the dialog showing the possible duplicates.
-A dialog will appear with <guibutton>Let me check more reports</guibutton>. To
-prevent checking for more reports and continue to file the report,
-<mousebutton>click</mousebutton> the <guibutton>There
-are no real duplicates</guibutton> button. A dialog will appear to enter
-additional information concerning the report.
+the <guibutton>Next</guibutton> button in the dialog showing the possible 
+duplicates. A dialog will appear with <guibutton>Let me check more 
+reports</guibutton>. To prevent checking for more reports and continue filing 
+the report, <mousebutton>click</mousebutton> the <guibutton>There
+are no real duplicates</guibutton> button. A dialog will appear asking you to 
+enter additional information concerning the report.
 </para>
 <para>
 <example>
 <title>Details of the Bug Report</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_report_details.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_report_details.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -337,16 +369,18 @@
 </step>
 <step>
 <para>
-Once the details of the bug report are complete,
-<mousebutton>click</mousebutton> the <guibutton>Next</guibutton> button. The
-following dialog will be presented.
+Once the details of the bug report are complete, 
+<mousebutton>click</mousebutton> the <guibutton>Next</guibutton> button. The 
+following dialog will be presented:
 </para>
 <para>
 <example>
 <title>Preview Report</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_report_details_preview.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_report_details_preview.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -355,14 +389,16 @@
 <step>
 <para>
 If the information looks correct, <mousebutton>click</mousebutton> the
-<guibutton>Next</guibutton> button. The following dialog will be presented.
+<guibutton>Next</guibutton> button. The following dialog will be presented:
 </para>
 <para>
 <example>
 <title>Send Crash Report</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/crash_report_assistant_report_filed.png" format="PNG"/>
+<imagedata 
+fileref="help:/images/C/crash_report_assistant_report_filed.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -370,18 +406,19 @@
 </step>
 </procedure>
 <para>
-<emphasis role="bold">Congratulations on a successful bug report!</emphasis>
-Identifying and reporting bugs are essential to improving &kubuntu; and KDE.
-Some emails may be sent to the registered address to update progress or to
-allow developers to get additional information about the bug.
+<emphasis>Congratulations on a successful bug report!</emphasis> Identifying 
+and reporting bugs are essential to improving &kubuntu; and 
+<trademark>KDE</trademark>. Some emails may be sent to the registered address 
+to update progress or to allow developers to get additional information about 
+the bug.
 </para>
 </sect2>
 <sect2 id="filing-crash-lp">
 <title>Launchpad</title>
 <para>
-When an application that is not KDE crashes in &kubuntu;, a pop-up notification
-will appear from <application>Apport</application> that is similar to the
-following image.
+When an application that is not <trademark>KDE</trademark> crashes in 
+&kubuntu;, a pop-up notification will appear from 
+<application>Apport</application> that is similar to the following image:
 </para>
 <para>
 <example><title>Apport Crash Pop-pup Notification</title>
@@ -394,11 +431,11 @@
 </para>
 <note><title>Crash information may be different</title>
 <para>
-The following screen shots were created by crashing the application
-<application>VLC</application> deliberately. Crash dialogs associated with other
-applications will be different. In an actual bug situation, the application
-name, <application>VLC</application>, will be replaced by the name of the
-application that actually crashed.
+The screen shots below were created by crashing the application 
+<application>VLC</application> deliberately. Crash dialogs associated with 
+other applications will be different. In an actual bug situation, the 
+application name, <application>VLC</application>, will be replaced by the name 
+of the application that actually crashed.
 </para>
 </note>
 <para>
@@ -409,7 +446,7 @@
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Details</guibutton> buttons on
 the <application>System Notification Helper</application>. The following dialog
-will be presented.
+will be presented:
 </para>
 <para>
 <example>
@@ -441,11 +478,11 @@
 </step>
 <step>
 <para>
-After all of the information concerning the crash is collected, a dialog will
-be presented that displays the details of the report, and the report is sent to
-the developers. <mousebutton>Click</mousebutton> the
+After all information concerning the crash is collected, a dialog will be 
+presented that displays the details of the report, and the report is sent to
+the developers. <mousebutton>Click</mousebutton> the 
 <guibutton>Details...</guibutton> button to view details of the report. The
-following dialog will be presented.
+following dialog will be presented:
 </para>
 <para>
 <example><title>Send problem report to the developers? (Details)</title>
@@ -460,8 +497,8 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Send</guibutton> button to send
-the report to the developers. In this case, it will send the report to
-Launchpad. The following progress dialog will be presented.
+the report to the developers. In this case, it will send the report to 
+<trademark>Launchpad</trademark>. The following progress dialog will be presented:
 </para>
 <para>
 <example><title>Uploading problem information</title>
@@ -476,15 +513,16 @@
 <step>
 <para>
 After the progress dialog completes, the default web browser will open to
-Launchpad presenting either the login page or the beginning of the online
-version of the bug reporting process. After logging in (if necessary) the
-following page will be presented.
+<trademark>Launchpad</trademark>, presenting either the log-in page or the 
+beginning of the online version of the bug reporting process. After logging in 
+(if necessary), the following page will be presented:
 </para>
 <para>
 <example><title>Please wait while bug data is processed...</title>
 <mediaobject>
 <imageobject>
-<imagedata fileref="help:/images/C/apport-browser-processing.png" format="PNG"/>
+<imagedata fileref="help:/images/C/apport-browser-processing.png" 
+format="PNG"/>
 </imageobject>
 </mediaobject>
 </example>
@@ -492,8 +530,8 @@
 </step>
 <step>
 <para>
-When Launchpad is finished processing the bug data, the following page will be
-presented.
+When <trademark>Launchpad</trademark> is finished processing the bug data, the 
+following page will be presented:
 </para>
 <para>
 <example><title>Extra debug information will be added...</title>
@@ -508,7 +546,7 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Next</guibutton> button. The
-following page will be presented.
+following page will be presented:
 </para>
 <para>
 <example><title>Further information</title>
@@ -522,10 +560,10 @@
 </step>
 <step>
 <para>
-Any extra information can be filled in about the bug report such as what was
-being done when it crashed or the online file locations that may have caused the
-crash. The following is a brief description filed with the report in
-this procedure.
+Any extra information about the bug report can be filled in to describe, for 
+example, what was being done when the application crashed or the online file 
+locations that may have caused the crash. The following is a brief description 
+filed with the report in this procedure:
 </para>
 <para>
 <example><title>Further information (Completed)</title>
@@ -540,7 +578,7 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Submit Bug Report</guibutton>
-button on the bottom of the page. The following page will be presented.
+button on the bottom of the page. The following page will be presented:
 </para>
 <para>
 <example><title>Thank you for your bug report</title>
@@ -554,10 +592,10 @@
 </step>
 </procedure>
 <para>
-<emphasis role="bold">Congratulations on making a successful crash
-report!</emphasis>Identifying and reporting bugs are essential to improving
-&kubuntu;. Some emails may be sent to the registered address to update progress
-or to allow developers to get additional information about the bug.
+<emphasis>Congratulations on making a successful crash report!</emphasis> 
+Identifying and reporting bugs are essential to improving &kubuntu;. Some 
+emails may be sent to the registered address to update progress or to allow 
+developers to get additional information about the bug.
 </para>
 </sect2>
 </sect1>
@@ -565,32 +603,33 @@
 <sect1 id="filing-non-crash">
 <title>Filing a Non-Crash or Regression Report</title>
 <para>
-If an application has regressed in functionality, a bug report should be
-filed on that application. A regress occurs when a function worked in a previous
-release but in the latest release, it is not working. In most cases, this type
-of report will be filed by those who have more experience and may be testing
-beta quality software. However there are situations where a user needs to report
-an issue with an application that isn't working right, but isn't crashing. The
-following procedures will help.
+If an application has regressed in functionality, a bug report should be filed 
+on that application. A regression occurs when a function worked in a previous
+release, but is not working in the latest release. In most cases, this type of 
+report will be filed by those who have previous experience and may be testing 
+beta quality software. There are, however, situations where a user needs to 
+report an issue with an application that isn't working right, but isn't 
+crashing. The following procedures will help:
 </para>
 <sect2 id="filing-non-crash-kde">
 <title>KDE</title>
 <para>
-Filing non-crash related bug reports for KDE applications are done with a web
-browser using <ulink url="https://bugs.kde.org/"/>.
+Filing non-crash related bug reports for <trademark>KDE</trademark> 
+applications is done with a web browser using 
+<ulink url="https://bugs.kde.org/"/>.
 </para>
 <note><title>Register first</title>
 <para>
 To report a bug, one must register for an account on the bug tracker.
-KDE's bug tracker is located at <ulink url="https://bugs.kde.org/"/>.
+<trademark>KDE</trademark>'s bug tracker is located at <ulink 
+url="https://bugs.kde.org/"/>.
 </para>
 </note>
 <procedure><title>Filing a bug report without a crash</title>
 <step>
 <para>
-In a web browser, go to <ulink url="https://bugs.kde.org/"/> and either
-create a new account or login. Once logged in, the following page will be
-presented.
+In a web browser, go to <ulink url="https://bugs.kde.org/"/> and either create 
+a new account or log in. Once logged in, the following page will be presented:
 </para>
 <para>
 <example><title>Welcome to the KDE Bug Tracking System</title>
@@ -605,8 +644,8 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guilabel>Report New Wish or Bug</guilabel>
-link in the top-right-hand corner of the page to start the process of filing the
-bug report. The following page will be presented.
+link in the top right-hand corner of the page to start the process of filing 
+the bug report. The following page will be presented:
 </para>
 <para>
 <example><title>Welcome to the KDE Bug Report Wizard!</title>
@@ -620,8 +659,8 @@
 </step>
 <step>
 <para>
-<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. The
-following page will be presented.
+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. 
+The following page will be presented:
 </para>
 <para>
 <example><title>Software Configuration</title>
@@ -639,7 +678,7 @@
 <guilabel>Distribution Method</guilabel> (Should be <guilabel>Ubuntu
 Packages</guilabel>) from the drop-down menus. <mousebutton>Click</mousebutton>
 the <guibutton>Continue</guibutton> button when finished with the selections.
-The following page will be presented.
+The following page will be presented:
 </para>
 <para>
 <example><title>Application Selection</title>
@@ -660,10 +699,10 @@
 </step>
 <step>
 <para>
-Under the <guilabel>Find</guilabel> section under the
-<guilabel>Application</guilabel> list, fill in the <guilabel>Keyword
+Under the <guilabel>Find</guilabel> section in the 
+<guilabel>Application</guilabel> list, fill in the <guilabel>Keyword 
 Search</guilabel> text box with the application being reported. It should look
-similar to the following image.
+similar to the following image:
 </para>
 <para>
 <example><title>Application Selection (Search for application)</title>
@@ -681,8 +720,8 @@
 </step>
 <step>
 <para>
-<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. The
-following page will be presented.
+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. 
+The following page will be presented:
 </para>
 <para>
 <example><title>General Information</title>
@@ -700,7 +739,7 @@
 information similar to the example under the text box. Select
 <guilabel>Linux</guilabel> in the <guilabel>Operating System</guilabel>
 drop-down menu. When completed, <mousebutton>Click</mousebutton> the
-<guibutton>Continue</guibutton> button. The following page will be presented.
+<guibutton>Continue</guibutton> button. The following page will be presented:
 </para>
 <para>
 <example><title>Check for Duplicate Bug Reports</title>
@@ -714,12 +753,12 @@
 </step>
 <step>
 <para>
-If a duplicate report is found, click on that report ID to view the report. If
-it is a duplicate and more information is needed, then simply enter text in the
-large text box confirming it. If more information is not needed, nothing need
-be entered. If no duplicate reports are found, <mousebutton>Click</mousebutton>
-the <guibutton>Continue</guibutton> button. The following page will be
-presented.
+If a duplicate report is found, click on that report <acronym>ID</acronym> to 
+view the report. If it is a duplicate and more information is needed, then 
+enter text into the large text box confirming it. If more information is not 
+needed, nothing needs to be entered. If no duplicate reports are found, 
+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. 
+The following page will be presented:
 </para>
 <para>
 <example><title>Bug Entry Form</title>
@@ -734,11 +773,11 @@
 <step>
 <para>
 The <guilabel>Severity</guilabel> (required) drop-down menu should display the
-<guilabel>Bug - Bug report (no crashes)</guilabel> option. In the <guilabel>Long
-Description in English</guilabel> (required) text box, enter all information
-pertaining to the bug report. When completed, <mousebutton>Click</mousebutton>
-the <guibutton>Continue</guibutton> button. The following page will be
-presented.
+<guilabel>Bug - Bug report (no crashes)</guilabel> option. In the 
+<guilabel>Long Description in English</guilabel> (required) text box, enter all 
+information pertaining to the bug report. When completed, 
+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. 
+The following page will be presented:
 </para>
 <para>
 <example><title>Bug Submitted</title>
@@ -752,27 +791,30 @@
 </step>
 </procedure>
 <para>
-<emphasis role="bold">Congratulations on making a successful non-crash related
-bug report!</emphasis> Identifying and reporting bugs are essential to improving
-&kubuntu; and KDE. Some emails may be sent to the registered address to update
-progress or to allow developers to get additional information about the bug.
+<emphasis>Congratulations on making a successful non-crash-related bug 
+report!</emphasis> Identifying and reporting bugs are essential to improving
+&kubuntu; and <trademark>KDE</trademark>. Some emails may be sent to the 
+registered address to update progress or to allow developers to get additional 
+information about the bug.
 </para>
 </sect2>
 <sect2 id="filing-non-crash-lp">
 <title>Launchpad</title>
 <para>
-Filing non-crash related bug reports in non-KDE applications can be done either
-by going to <ulink url="https://bugs.launchpad.net/ubuntu/+filebug"/> in a web
-browser or by using the <application>Apport</application> bug reporting
-application. The following procedure will demonstrate the use of
-<application>Apport</application> as this is the recommended way of filing
-Ubuntu or non-KDE related bug reports.
+Filing non-crash-related bug reports in non-<trademark>KDE</trademark> 
+applications can be done either by going to <ulink 
+url="https://bugs.launchpad.net/ubuntu/+filebug"/> in a web browser or by using 
+the <application>Apport</application> bug reporting application. The following 
+procedure will demonstrate the use of <application>Apport</application> as this 
+is the recommended way of filing &ubuntu; or 
+non-<trademark>KDE</trademark>-related bug reports:
 </para>
 <procedure><title>Filing a bug report without a crash</title>
 <step>
 <para>
-Open <application>KRunner</application>, the KDE run command interface, by
-pressing <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>.
+Open <application>KRunner</application>, the <trademark>KDE</trademark> run 
+command interface, by pressing 
+<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>.
 </para>
 <para>
 <example><title>KRunner</title>
@@ -786,10 +828,11 @@
 </step>
 <step>
 <para>
-In the <application>KRunner</application> dialog, enter <userinput>apport-bug -p
-PROGRAM_NAME</userinput>. Replace <emphasis>PROGRAM_NAME</emphasis> with the
-name of the program the bug report is for. Press <keycap>Enter</keycap> when
-complete. The following dialog will be presented.
+In the <application>KRunner</application> dialog, enter 
+<userinput>apport-bug -p PROGRAM_NAME</userinput>. Replace 
+<emphasis>PROGRAM_NAME</emphasis> with the name of the program the bug report 
+is for. Press <keycap>Enter</keycap> when complete. The following dialog will 
+be presented:
 </para>
 <para>
 <example><title>Collecting Problem Information</title>
@@ -818,9 +861,9 @@
 </step>
 <step>
 <para>
-<mousebutton>Click</mousebutton> the <guibutton>Details...</guibutton> button to
-see details of the report to be followed. The following dialog will be
-presented.
+<mousebutton>Click</mousebutton> the <guibutton>Details...</guibutton> button 
+to see details of the report to be followed. The following dialog will be
+presented:
 </para>
 <para>
 <example><title>Report Details</title>
@@ -835,7 +878,7 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Send</guibutton> button to send
-the report to the developers. The following progress dialog will be presented.
+the report to the developers. The following progress dialog will be presented:
 </para>
 <para>
 <example><title>Uploading Problem Information</title>
@@ -850,7 +893,7 @@
 <step>
 <para>
 After the information has been uploaded, the web browser will open and display
-a page similar to the following.
+a page similar to the following:
 </para>
 <para>
 <example><title>Please wait while bug data is processed.</title>
@@ -862,7 +905,7 @@
 </example>
 </para>
 <para>
-After the bug data is processed, the following page will be presented.
+After the bug data is processed, the following page will be presented:
 </para>
 <para>
 <example><title>Report a bug... (Summary)</title>
@@ -876,9 +919,9 @@
 </step>
 <step>
 <para>
-Enter text in the <guilabel>Summary</guilabel> text box that describes the bug
-with a few words. When finished, <mousebutton>Click</mousebutton> the
-<guibutton>Next</guibutton> button. The following page will be presented.
+Enter text that describes the bug into the <guilabel>Summary</guilabel> text 
+box. When finished, <mousebutton>Click</mousebutton> the 
+<guibutton>Next</guibutton> button. The following page will be presented:
 </para>
 <para>
 <example><title>Report a bug... (Further information)</title>
@@ -895,7 +938,7 @@
 Enter text in the <guilabel>Further information</guilabel> text box describing
 the bug in detail. When complete, <mousebutton>Click</mousebutton> the
 <guibutton>Submit Bug Report</guibutton> button. The following page will be
-presented.
+presented:
 </para>
 <para>
 <example><title>Thank you for your bug report</title>
@@ -909,8 +952,8 @@
 </step>
 </procedure>
 <para>
-<emphasis role="bold">Congratulations on making a successful non-crash related
-bug report!</emphasis> Identifying and reporting bugs are essential to improving
+<emphasis>Congratulations on making a successful non-crash related bug 
+report!</emphasis> Identifying and reporting bugs are essential to improving
 &kubuntu;. Some emails may be sent to the registered address to update progress
 or to allow developers to get additional information about the bug.
 </para>
@@ -920,21 +963,24 @@
 <sect1 id="filing-wishlist">
 <title>Filing a Feature Request or Wishlist Report</title>
 <para>
-The easiest way to request a new feature in either an application or the
-operating system is to file a bug, otherwise known as a wishlist report.
+The easiest way to request a new feature, in either an application or the
+operating system, is to file a bug &mdash; otherwise known as a wishlist 
+report.
 </para>
 <sect2 id="filing-wishlist-kde">
 <title>KDE</title>
 <para>
-Filing a feature request report in KDE is exactly the same as filing a <link
-linkend="filing-non-crash-kde">non-crash KDE bug report</link>.
+Filing a feature request report in <trademark>KDE</trademark> is exactly the 
+same as filing a <link linkend="filing-non-crash-kde">non-crash 
+<trademark>KDE</trademark> bug report</link>.
 </para>
 </sect2>
 <sect2 id="filing-wishlist-lp">
 <title>Launchpad</title>
 <para>
 Filing a wishlist report for &kubuntu; is exactly the same as filing a <link
-linkend="filing-non-crash-lp">non-crash Launchpad bug report</link>.
+linkend="filing-non-crash-lp">non-crash <trademark>Launchpad</trademark> bug 
+report</link>.
 </para>
 </sect2>
 </sect1>
 
=== modified file 'docs/cli/C/cli.xml'
--- docs/cli/C/cli.xml	2011-09-04 21:26:14 +0000
+++ docs/cli/C/cli.xml	2012-03-22 07:41:34 +0000
@@ -13,9 +13,9 @@
 &legalnotice;
 <abstract>
 <para>
-This document provides a brief description of the Linux command line. It is not
-a complete guide to the command line, but rather an introduction to complement
-&kubuntu;&apos;s graphical tools.
+This document provides a brief description of the <trademark>Linux</trademark> 
+command line. It is not a complete guide, but rather an introduction to 
+complement &kubuntu;'s graphical tools.
 </para>
 </abstract>
 </articleinfo>
@@ -25,37 +25,41 @@
 
 <para>
 <emphasis>
-"Under Linux there are GUIs (graphical user interfaces), where you can point and
-click and drag, and hopefully get work done without first reading lots of
-documentation. The traditional Unix environment is a CLI (command line
-interface), where you type commands to tell the computer what to do. That is
-faster and more powerful, but requires finding out what the commands are." --
-from <emphasis role="strong">man intro(1)</emphasis>
+"Under <trademark>Linux</trademark> there are <acronym>GUI</acronym>s 
+(graphical user interfaces), where you can point and click and drag and 
+hopefully get work done without first reading lots of documentation. The 
+traditional <trademark>Unix</trademark> environment is a 
+<acronym>CLI</acronym> (command line interface), where you type commands to 
+tell the computer what to do. That is faster and more powerful, but requires 
+finding out what the commands are." -- from <emphasis>man intro(1)</emphasis>
 </emphasis>
 </para>
 <para>
-This guide describes some basic GNU/Linux shell commands. It is not intended to
-be a complete guide to the command line, just an introduction to complement
-&kubuntu;&apos;s graphical tools.
+This guide describes some basic <trademark>GNU</trademark>/
+<trademark>Linux</trademark> shell commands. It is not intended to be a 
+complete guide to the command line, just an introduction to complement 
+&kubuntu;'s graphical tools.
 </para>
 <para>
 <itemizedlist>
 <listitem>
 <para>
-All command names, file names or paths to directories will be shown using a <command>monospace font</command>.
+All command names, file names, or paths to directories will be shown using a 
+<command>monospace font</command>.
 </para>
 </listitem>
 <listitem>
 <para>
-The commands should be issued from a command prompt within a
+The commands should be issued from a command prompt within a 
 <application>Terminal</application> and will be shown as:
 <screen>command to type</screen>
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis role="strong">Command Line Linux is case sensitive.</emphasis> User,
-user, and USER are each different and distinct in Linux.
+<emphasis>Command Line <trademark>Linux</trademark> is case 
+sensitive.</emphasis> User, user, and USER are each different and distinct in 
+<trademark>Linux</trademark>.
 </para>
 </listitem>
 </itemizedlist>
@@ -65,12 +69,12 @@
 <sect1 id="terminal">
 <title>Starting A Terminal</title>
 <para>
-&kubuntu;&apos;s Terminal application is called
-<application>Konsole</application>, and is opened by going to &menukonsole;.
+&kubuntu;'s Terminal application is called <application>Konsole</application>, 
+and is opened by going to &menukonsole;.
 </para>
 <para>
 <example>
-<title>&kubuntu;&apos;s terminal - Konsole</title>
+<title>&kubuntu;'s terminal - Konsole</title>
 <mediaobject>
 <imageobject>
 <imagedata fileref="help:/images/C/C/konsole.png" format="PNG"/>
@@ -86,12 +90,10 @@
 <sect2 id="pwd">
 <title>pwd - print working directory</title>
 <para>
-The <command>pwd</command> command displays the directory where the user is
-currently
-located. (<acronym>pwd</acronym> stands for <quote>print working
-directory</quote>). For example, typing 
-<screen>pwd</screen> while in the <filename
-class="directory">Desktop</filename> will show
+The <command>pwd</command> command displays the directory where the user is 
+currently located. (<acronym>pwd</acronym> stands for <quote>print working
+directory</quote>). For example, typing <screen>pwd</screen> while in the 
+<filename class="directory">Desktop</filename> directory will show 
 <computeroutput>/home/[username]/Desktop</computeroutput>.
 <note>
 <para>
@@ -105,9 +107,9 @@
 <title>cd - change directory</title>
 <para>
 The <command>cd</command> command changes directories. (<acronym>cd</acronym>
-stands for
-<quote>change directory</quote>). When a terminal window is opened, it will be in the user's home directory. Moving around the file system requires the
-use of the <command>cd</command>.
+stands for <quote>change directory</quote>). When a terminal window is opened, 
+it will be in the user's home directory. Moving around the file system requires 
+the use of the <command>cd</command> command.
 </para>
 <itemizedlist>
 <listitem>
@@ -125,8 +127,8 @@
 </para>
 <note>
 <para>
-The <command>~</command> character represents the current user's home directory.
-As shown above, <command>cd ~</command> is equivalent to <command>cd
+The <command>~</command> character represents the current user's home 
+directory. As shown above, <command>cd ~</command> is equivalent to <command>cd
 /home/username/</command>. However, when running a command as root (using
 <command>sudo</command>, for example), <command>~</command> points to <filename
 class="directory">/root</filename>. When running a <command>cd</command> command
@@ -161,8 +163,8 @@
 of <filename class="directory">/var/</filename>. For another example, typing:
 <screen>cd ~/Desktop</screen> 
 moves to the <filename
-class="directory">Desktop</filename> subdirectory inside the current user's home
-directory.
+class="directory">Desktop</filename> subdirectory inside the current user's 
+home directory.
 </para>
 </listitem>
 </itemizedlist>
@@ -171,11 +173,9 @@
 <title>ls - list files</title>
 <para>
 The <command>ls</command> command outputs a list of the files in the current
-directory. (<acronym>ls</acronym> is short for <quote>list</quote>). For example,
-typing 
-<screen>ls ~</screen> 
-will display the files that are in the current
-user's home directory.
+directory. (<acronym>ls</acronym> is short for <quote>list</quote>). For 
+example, typing  <screen>ls ~</screen> will display the files that are in the 
+current user's home directory.
 </para>
 <para>
 Used with the <command>-l</command> option, <command>ls</command> outputs other
@@ -185,34 +185,34 @@
 <para>
 Used with the <command>-al</command> options, <command>ls</command> outputs
 the information associated with the <command>-l</command> option in addition to
-showing hidden files (<command>a</command>
-option).
+showing hidden files (<command>a</command> option).
 </para>
 </sect2>
 <sect2 id="touch">
 <title>touch - create empty file</title>
 <para>
-The <command>touch</command> command is used either to change a file's access
-and modification timestamps or to create a new empty file. For example,
-<screen>touch foo</screen>
-will create a new empty file named <filename>foo</filename>. If
-<filename>foo</filename> is already a file, then using <command>touch</command>
-will update the timestamps on the file which will show
-the last time a file was <emphasis>touched</emphasis>.
+The <command>touch</command> command is used to change a file's access and 
+modification timestamps or to create a new empty file. For example, 
+<screen>touch foo</screen> will create a new empty file named 
+<filename>foo</filename>. If <filename>foo</filename> is already a file, then 
+using <command>touch</command> will update the timestamps on the file, which 
+show the last time a file was <emphasis>touched</emphasis>.
 </para>
 </sect2>
 <sect2 id="mkdir">
 <title>mkdir - make directory</title>
 <para>
-The <command>mkdir</command> command is used to create a new directory. (<acronym>mkdir</acronym> stands for <quote>make directory</quote>). To create a
-new directory named <filename class="directory">foobar</filename>, type:
+The <command>mkdir</command> command is used to create a new directory. 
+(<acronym>mkdir</acronym> stands for <quote>make directory</quote>). To create 
+a new directory named <filename class="directory">foobar</filename>, type:
 <screen>mkdir foobar</screen>
 </para>
 </sect2>
 <sect2 id="cp">
 <title>cp - copy files or directories</title>
 <para>
-The <command>cp</command> command makes a copy of a file or directory. (<acronym>cp</acronym> is short for <quote>copy</quote>). To make an exact copy
+The <command>cp</command> command makes a copy of a file or directory. 
+(<acronym>cp</acronym> is short for <quote>copy</quote>). To make an exact copy
 of <filename>foo</filename> and name it <filename>bar</filename>, type:
 <screen>cp foo bar</screen>
 To make an exact copy of the <filename class="directory">foo_dir</filename>
@@ -224,34 +224,32 @@
 <title>mv - move files or directories</title>
 <para>
 The <command>mv</command> command moves a file or directory to a different
-location or will rename a file or directory. (<acronym>mv</acronym> is short for
+location or renames a file or directory. (<acronym>mv</acronym> is short for
 <quote>move</quote>). To rename the file <filename>foo</filename> to
-<filename>bar</filename>, type: 
-<screen>mv foo bar</screen>
-To move the file <filename>foo</filename> into the current user's <filename
-class="directory">Desktop</filename> directory, type:
-<screen>mv foo ~/Desktop</screen>
-This will not rename <filename>foo</filename> to <filename>Desktop</filename>
-because <filename>foo</filename> is a file and <filename
-class="directory">Desktop</filename> is a directory.
+<filename>bar</filename>, type: <screen>mv foo bar</screen> To move the file 
+<filename>foo</filename> into the current user's <filename
+class="directory">Desktop</filename> directory, type: <screen>mv foo 
+~/Desktop</screen> This will not rename <filename>foo</filename> to 
+<filename>Desktop</filename>, because <filename>foo</filename> is a file and 
+<filename class="directory">Desktop</filename> is a directory.
 </para>
 </sect2>
 <sect2 id="rm">
 <title>rm - remove files or directories</title>
 <para>
-The <command>rm</command> command is used to delete files and directories. (<acronym>rm</acronym> is short for <quote>remove</quote>). To delete the file
-<filename>foo</filename> for the current directory, type: 
+The <command>rm</command> command is used to delete files and directories. 
+(<acronym>rm</acronym> is short for <quote>remove</quote>). To delete the file
+<filename>foo</filename> from the current directory, type: 
 <screen>rm foo</screen>
 </para>
 <para>
 By default, <command>rm</command> will not remove directories. To remove a
-directory, you must use the <command>-r</command> option (also can be entered
-as either <command>-R</command> or <command>--recursive</command>). For example,
-<screen>rm -r foobar</screen> or 
-<screen>rm -R foobar</screen> or 
-<screen>rm --recursive foobar</screen> 
-will remove the directory <filename class="directory">foobar</filename>,
-<emphasis role="strong"> and all of its contents!</emphasis>
+directory, you must use the <command>-r</command> option (which can also be 
+entered as <command>-R</command> or <command>--recursive</command>). For 
+example, <screen>rm -r foobar</screen> or <screen>rm -R foobar</screen> or 
+<screen>rm --recursive foobar</screen> will remove the directory 
+<filename class="directory">foobar</filename> <emphasis> and all of its 
+contents!</emphasis>
 </para>
 </sect2>
 
@@ -265,8 +263,7 @@
 <para>
 The <command>df</command> command displays filesystem disk space usage for all
 partitions. (<acronym>df</acronym> stands for <quote>disk free</quote>).
-<screen>df -h</screen> 
-will give information using megabytes
+<screen>df -h</screen> will give information using megabytes
 (<abbrev>M</abbrev>) and gigabytes (<abbrev>G</abbrev>) instead of blocks
 (<command>-h</command> means <quote>human readable</quote>).
 </para>
@@ -275,26 +272,24 @@
 <title>free - display amount of free and used memory</title>
 <para>
 The <command>free</command> command displays the amount of free and used memory
-in the system.
-<screen>free -m</screen>
-will give the information using megabytes, which is probably the most useful for
-current computers.
+in the system. <screen>free -m</screen> will give the information using 
+megabytes, which is probably the most useful for current computers.
 </para>
 </sect2>
 <sect2 id="top">
 <title>top - display top consuming processes</title>
 <para>
-The <command>top</command> command displays information on the Linux system -
-processes that are running, system resources including <acronym>CPU</acronym>,
-<acronym>RAM</acronym> &amp; swap usage, and the total number of tasks being
-run. To
-exit <command>top</command>, press <keycap>q</keycap>.
+The <command>top</command> command displays information on the 
+<trademark>Linux</trademark> system - processes that are running, system 
+resources including <acronym>CPU</acronym>, <acronym>RAM</acronym> &amp; swap 
+usage, and the total number of tasks being run. To exit <command>top</command>, 
+press <keycap>q</keycap>.
 </para>
 </sect2>
 <sect2 id="uname">
 <title>uname - print details about the current machine</title>
 <para>
-The <command>uname</command> command with the <command>-a</command> options
+The <command>uname</command> command with the <command>-a</command> option
 displays all system information, including machine name, kernel name &amp;
 version, and other details. This command is useful for checking which kernel is
 in use. (<abbrev>uname</abbrev> is short for <quote>unix name</quote>).
@@ -304,8 +299,8 @@
 <title>lsb_release - print details about current Linux release</title>
 <para>
 The <command>lsb_release</command> with the <command>-a</command> option prints
-version information for the Linux release in use. For example, typing:
-<screen>lsb_release -a</screen> will display:
+version information for the <trademark>Linux</trademark> release in use. For 
+example, typing: <screen>lsb_release -a</screen> will display:
 <screen>No LSB modules are available.
 Distributor ID: Ubuntu
 Description:    Ubuntu &distro-rev;
@@ -323,49 +318,41 @@
 The following commands must be prefaced with the
 <command>sudo</command> command. Please see <ulink
 url="https://help.ubuntu.com/community/RootSudo">RootSudo</ulink> for
-information on using <command>sudo</command>. (<abbrev>sudo</abbrev> is short for
-<quote>superuser do</quote>).
+information on using <command>sudo</command>. (<abbrev>sudo</abbrev> is short 
+for <quote>superuser do</quote>).
 </para>
 <sect2 id="add-group">
 <title>Adding a New Group</title>
 <para>
 The <command>addgroup</command> command is used to create a new group in the
-system. To create a new group, type:
-<screen>sudo addgroup foobar</screen>
-The above command will create a new group called <emphasis
-role="strong">foobar</emphasis>.
+system. To create a new group, type: <screen>sudo addgroup foobar</screen> The 
+above command will create a new group called <emphasis>foobar</emphasis>.
 </para>
 </sect2>
 <sect2 id="add-user">
 <title>Adding a New User</title>
 <para>
 The <command>adduser</command> command is used to create a new user on the
-system. To create a new user, type:
-<screen>adduser foobar</screen>
-which will create a new user called <emphasis role="strong">foobar</emphasis>.
+system. To create a new user, type: <screen>adduser foobar</screen> which will 
+create a new user called <emphasis>foobar</emphasis>.
 </para>
 </sect2>
 <sect2 id="passwd">
 <title>Add or Change a User Password</title>
 <para>
 The <command>passwd</command> command is used to assign a new password to a
-new user or to change the current password for an existing user. To add a
-password or change the password for the user <emphasis
-role="strong">foobar</emphasis>,
-type:
-<screen>passwd foobar</screen>
-For new users, this will generate a prompt to enter the new password. For
-an
-existing user, there will be a prompt for the existing password before the
-prompt for a new password.
+new user or change the current password for an existing user. To add a password 
+or change the password for the user <emphasis>foobar</emphasis>, type:
+<screen>passwd foobar</screen> For new users, this will generate a prompt to 
+enter the new password. For an existing user, there will be a prompt for the 
+existing password before the prompt for a new password.
 </para>
 </sect2>
 <sect2 id="assign-user-group">
 <title>Assign User to Group</title>
 <para>
-To assign the user <emphasis role="strong">foobar</emphasis> to the group
-<emphasis role="strong">barfoo</emphasis>, type:
-<screen>adduser foobar barfoo</screen>
+To assign the user <emphasis>foobar</emphasis> to the group 
+<emphasis>barfoo</emphasis>, type: <screen>adduser foobar barfoo</screen>
 </para>
 </sect2>
 </sect1>
@@ -374,20 +361,20 @@
 <sect1 id="options">
 <title>Options</title>
 <para>
-The default behavior for a command may usually be modified by adding <command>--option</command> to the command. For example, the <link
-linkend="ls"><command>ls</command></link> command has an
-<command>-s</command> option. The <command>ls -s</command> will include file
-sizes in the listing. There is also a <command>-h</command> option to display
-file sizes in a <quote>human readable</quote> format.
+The default behavior for a command may usually be modified by adding 
+<command>--option</command> to the command. For example, the <link 
+linkend="ls"><command>ls</command></link> command has an <command>-s</command> 
+option. The <command>ls -s</command> will include file sizes in the listing. 
+There is also a <command>-h</command> option to display file sizes in a 
+<quote>human readable</quote> format.
 </para>
 <para>
 Options can be grouped in clusters, so
 <screen>ls -sh</screen>
 is the same command as
 <screen> ls -s -h</screen>
-Most options have a long version, prefixed with two dashes instead of one, so
-<screen>ls --size --human-readable</screen>
-is also the same command as 
+Most options have a long version prefixed with two dashes instead of one, so
+<screen>ls --size --human-readable</screen> is the same command as 
 <screen>ls -sh</screen>
 </para>
 </sect1>
@@ -396,14 +383,13 @@
 <sect1 id="man-help">
 <title><quote>Man</quote> and Getting Help</title>
 <para>
-<emphasis role="strong"><emphasis>command</emphasis> --help</emphasis> and
-<command>man</command> <emphasis
-role="strong"><emphasis>command</emphasis></emphasis> are the two most important
+<emphasis><emphasis>command</emphasis> --help</emphasis> and 
+<command>man</command> <emphasis>command</emphasis> are the two most important
 tools at the command line.
 </para>
 <para>
 Virtually all commands understand the <command>-h</command> (or
-<command>--help</command>) option which will produce a short usage description
+<command>--help</command>) option, which will produce a short usage description
 of the command and its options, then exit back to the command prompt. Type:
 <screen>man -h</screen>
 or
@@ -411,33 +397,29 @@
 to see this in action.
 </para>
 <para>
-Every command and nearly every application in Linux has a
-<abbrev>man</abbrev> (manual) file. It is as simple as typing <command>man
+Every command and nearly every application in <trademark>Linux</trademark> has 
+a <abbrev>man</abbrev> (manual) file. It is as simple as typing <command>man
 command</command> to bring up a longer manual entry for the specified command.
-For example:
-<screen>man mv</screen>
-brings up the <command>mv</command> manual.
+For example: <screen>man mv</screen> brings up the <command>mv</command> 
+manual.
 </para>
 <para>
 Move up and down the man file with the arrow keys, and quit back to the command
 prompt with <keycap>q</keycap>.
 </para>
 <para>
-<screen>man man</screen>
-brings up the manual entry for the <command>man</command> command, which is a
-good place to start.
+<screen>man man</screen> brings up the manual entry for the 
+<command>man</command> command, which is a good place to start.
 </para>
 <para>
-<screen>man intro</screen>
-is especially useful. It displays the <quote>introduction to user
-commands</quote> which is a well-written, brief introduction to the Linux
-command line.
+<screen>man intro</screen> is especially useful. It displays the 
+<quote>introduction to user commands</quote> which is a well-written, brief 
+introduction to the <trademark>Linux</trademark> command line.
 </para>
 <para>
 There are also <command>info</command> pages, which generally go into more
-detail than <command>man</command> pages. Try:
-<screen>info info</screen>
-for the introduction to info pages.
+detail than <command>man</command> pages. Try: <screen>info info</screen> for 
+the introduction to info pages.
 </para>
 <sect2 id="searching-for-man-files">
 <title>Searching for man files</title>
@@ -473,14 +455,14 @@
 There are often situations that require text to be pasted into the terminal.
 </para>
 <para>
-Text copied from a web page using
+Text copied from a web page using 
 <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> won't paste with
 <keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> as it does in
-other applications because the
-terminal uses a different combination for paste,
-<keycombo><keycap>Shift</keycap><keycap>Insert</keycap></keycombo>. Pasting can
-also be done using the mouse by <mousebutton>right-clicking</mousebutton> in
-the terminal and selecting <guimenuitem>Paste</guimenuitem> from the menu.
+other applications, because the terminal uses the 
+<keycombo><keycap>Shift</keycap><keycap>Insert</keycap></keycombo> 
+combination. Pasting can also be done using the mouse by 
+<mousebutton>right-clicking</mousebutton> in the terminal and selecting 
+<guimenuitem>Paste</guimenuitem> from the menu.
 </para>
 <para>
 Text can also be copied by selecting (highlighting) the text to be copied.
@@ -490,8 +472,9 @@
 </para>
 <note>
 <para>
-These actions may work differently in other terminal emulators than <application>Konsole</application>.
-Consult your terminal emulator's documentation for details.
+These actions may work differently in other terminal emulators than 
+<application>Konsole</application>. Consult your terminal emulator's 
+documentation for details.
 </para>
 </note>
 </sect1>
@@ -507,7 +490,7 @@
 </term>
 <listitem>
 <para>
-Scrolls backwards through the commands entered previously
+Scrolls backwards through the commands entered previously.
 </para>
 </listitem>
 </varlistentry>
@@ -518,7 +501,7 @@
 </term>
 <listitem>
 <para>
-Scrolls forward through previous commands
+Scrolls forward through previous commands.
 </para>
 </listitem>
 </varlistentry>
@@ -528,7 +511,7 @@
 </term>
 <listitem>
 <para>
-Executes the command selected
+Executes the selected command.
 </para>
 </listitem>
 </varlistentry>
@@ -539,7 +522,7 @@
 <listitem>
 <para>
 Tab is a useful feature. It autocompletes any commands or filenames if there is
-one option, otherwise it displays a list of options that fit the information
+one option. Otherwise it displays a list of options that fit the information
 entered. Using tab in this way reduces typing errors.
 </para>
 </listitem>
@@ -567,7 +550,7 @@
 </term>
 <listitem>
 <para>
-Moves the cursor to the <emphasis>start</emphasis> of the line
+Moves the cursor to the <emphasis>start</emphasis> of the line.
 </para>
 </listitem>
 </varlistentry>
@@ -578,7 +561,7 @@
 </term>
 <listitem>
 <para>
-Moves the cursor to the <emphasis>end</emphasis> of the line
+Moves the cursor to the <emphasis>end</emphasis> of the line.
 </para>
 </listitem>
 </varlistentry>
@@ -588,7 +571,7 @@
 </term>
 <listitem>
 <para>
-Deletes from the current cursor position to the end of the line
+Deletes from the current cursor position to the end of the line.
 </para>
 </listitem>
 </varlistentry>
@@ -598,7 +581,7 @@
 </term>
 <listitem>
 <para>
-Deletes the entire current line
+Deletes the entire current line.
 </para>
 </listitem>
 </varlistentry>
@@ -608,7 +591,7 @@
 </term>
 <listitem>
 <para>
-Deletes the word before the cursor
+Deletes the word before the cursor.
 </para>
 </listitem>
 </varlistentry>
@@ -624,8 +607,8 @@
 <itemizedlist>
 <listitem>
 <para>
-<ulink url="https://help.ubuntu.com/community/AptGetHowto">AptGetHowto</ulink> -
-using <command>apt-get</command> to install packages from the command line.
+<ulink url="https://help.ubuntu.com/community/AptGetHowto">AptGetHowto</ulink> 
+- using <command>apt-get</command> to install packages from the command line.
 </para>
 </listitem>
 <listitem>
@@ -653,25 +636,26 @@
 <para>
 <ulink url="https://help.ubuntu.com/community/CommandlineHowto">Commandline
 Howto</ulink> - longer and more complete than this basic guide; still not
-finished however.
+finished, however.
 </para>
 </listitem>
 <listitem>
 <para>
 <ulink url="https://help.ubuntu.com/community/HowToReadline">Howto
-Readline</ulink> - information on more advanced customization for the
-command line.
+Readline</ulink> - information on more advanced customization for the command 
+line.
 </para>
 </listitem>
 </itemizedlist>
 <para>
-For more detailed tutorials on the Linux command line, please see:
+For more detailed tutorials on the <trademark>Linux</trademark> command line, 
+please see:
 </para>
 <itemizedlist>
 <listitem>
 <para>
-<ulink url="http://ss64.com/bash/"/> - an A-Z index of the Bash command line for
-Linux.
+<ulink url="http://ss64.com/bash/"/> - an A-Z index of the 
+<trademark>Bash</trademark> command line for <trademark>Linux</trademark>.
 </para>
 </listitem>
 <listitem>
@@ -682,19 +666,20 @@
 </listitem>
 <listitem>
 <para>
-<ulink url="http://linuxsurvival.com/index.php" /> - Java-based tutorials.
+<ulink url="http://linuxsurvival.com/index.php" /> - 
+<trademark>Java</trademark>-based tutorials.
 </para>
 </listitem>
 <listitem>
 <para>
 <ulink url="http://rute.2038bug.com/index.html.gz"/> - a massive online book
-about system administration, almost all from the command line.
+about system administration &mdash; almost all from the command line.
 </para>
 </listitem>
 <listitem>
 <para>
-<ulink url="http://www.commandlinefu.com/"/> - a place to record command-line
-favorites and view other's gems as well.
+<ulink url="http://www.commandlinefu.com/"/> - a place to record command line
+favorites and view others' gems as well.
 </para>
 </listitem>
 </itemizedlist>
 
=== modified file 'docs/security/C/security.xml'
--- docs/security/C/security.xml	2010-03-26 21:38:03 +0000
+++ docs/security/C/security.xml	2012-03-22 07:41:34 +0000
@@ -70,24 +70,25 @@
 Keyboard shortcuts can be changed in <application>System Settings</application>
 under the <guilabel>Keyboard &amp; Mouse</guilabel>. To access these settings,
 go to Menu Bread Crumbs. Select <guilabel>Global Keyboard Shortcuts</guilabel>,
-in the KDE component dropdown, select <guilabel>Run Command Interface</guilabel>
-and locate <guilabel>Lock Session</guilabel>.
+in the <trademark>KDE</trademark> component drop-down, select <guilabel>Run 
+Command Interface</guilabel>, and locate <guilabel>Lock Session</guilabel>.
 </para>
 </note>
 
 <note><title>Adding a lock screen button to the panel</title>
 <para>
 A <guibutton>Lock Screen</guibutton> button can be added to the
-<application>Panel</application> for quick and easy screen locking. Right-click
-the <application>Panel</application>, select <guibutton>Add
-Widgets...</guibutton>, select <guibutton>Lock/Logout</guibutton> and drag it
-to the proper location on the Panel.
+<application>Panel</application> for quick and easy screen locking. 
+<mousebutton>Right-click</mousebutton> the <application>Panel</application>, 
+select <guibutton>Add Widgets...</guibutton>, select 
+<guibutton>Lock/Logout</guibutton>, and drag it to the proper location on the 
+<application>Panel</application>.
 </para>
 </note>
 
 <para>
 To unlock the screen, move the mouse or press a key. Enter the password, and
-either press the <keycap>Return</keycap> key or press the
+either press the <keycap>Return</keycap> key or press the 
 <guibutton>Unlock</guibutton> button.
 </para>
 <para>
@@ -105,17 +106,17 @@
 
 <para>
 <application>Guarddog</application> is the firewall of choice for &kubuntu;.
-Please review the <ulink type="help"
-url="help:/kubuntu/network/">Networking</ulink>
-documentation and locate the <application>Guarddog</application> section.
+Please review the <ulink type="help" 
+url="help:/kubuntu/network/">Networking</ulink> documentation and locate the 
+<application>Guarddog</application> section.
 </para>
 </sect1>
 
 <sect1 id="keep-safe-avoid-internet-crime" status="complete">
 <title>Avoid Internet nuisances and crime</title>
 
-<para>From time to time, email messages carry viruses or links to fraudulent
-websites. It is important to learn how to deal with these messages, in order to
+<para>From time to time email messages carry viruses or links to fraudulent
+web sites. It is important to learn how to deal with these messages in order to
 prevent the computer or personal information from being compromised or misused.
 </para>
 
@@ -131,20 +132,20 @@
 <itemizedlist>
 <listitem>
 <para>
-Spam (junk) email with offers for unwanted services and products
-</para>
-</listitem>
-
-<listitem>
-<para>
-Scam emails asking for help in exchange for money
-</para>
-</listitem>
-
-<listitem>
-<para>
-Phishing email that appears to be from a bank or other online service, asking
-for personal and financial details, or passwords
+Spam (junk) email with offers for unwanted services and products.
+</para>
+</listitem>
+
+<listitem>
+<para>
+Scam emails asking for help in exchange for money.
+</para>
+</listitem>
+
+<listitem>
+<para>
+Phishing email, that appears to be from a bank or other online service, asking
+for personal and financial details or passwords.
 </para>
 </listitem>
 </itemizedlist>
@@ -159,7 +160,7 @@
 
 <listitem>
 <para>
-Never click on links in emails that lead to websites asking for passwords or
+Never click on links in emails that lead to web sites asking for passwords or
 similar information. It is possible for the text of the link to show one
 address, but clicking on the link actually connects to a different (possibly
 dangerous) address. Instead of clicking a potentially misleading link, type the
@@ -169,22 +170,22 @@
 
 <listitem>
 <para>
-When visiting a website that asks for financial information, ensure that it is
-secure. <application>Konqueror</application> and
+When visiting a web site that asks for financial information, ensure that it is
+secure. <application>Konqueror</application> and 
 <application>Firefox</application> are two browsers commonly used in &kubuntu;.
-Both have two areas that indicate if the current page is secure. On secure
-webpages, the address bar will have a yellow background and a lock
-symbol to the right of the address. The second area is the status bar located at
-the bottom right of the browser window. If the page is secure, a lock icon will
-appear in this area. Clicking on either of the lock symbols will produce a
-dialog that explains the type of licensing and security for that page.
+Both have two areas that indicate if the current page is secure. On secure web 
+pages, the address bar will have a yellow background and a lock symbol to the 
+right of the address. The second area is the status bar located at the bottom 
+right of the browser window. If the page is secure, a lock icon will appear in 
+this area. Clicking on either of the lock symbols will produce a dialog that 
+explains the type of licensing and security for the page.
 </para>
 </listitem>
 
 <listitem>
 <para>
 Only download and run software from trusted sources. By default, software can
-only be downloaded directly from Ubuntu.
+only be downloaded directly from &ubuntu;.
 </para>
 </listitem>
 </itemizedlist>
@@ -196,8 +197,8 @@
 <para>
 Occasionally users lose computer information. There are many possible causes
 for such unforeseen <emphasis>data loss</emphasis>. The problem could be
-anything from a power loss or equipment failure to accidentally deleting a file.
-With regular backup copies, if a problem should occur, it may be possible
+anything from a power loss or equipment failure to accidentally deleting a 
+file. With regular backup copies, if a problem should occur, it may be possible
 to retrieve important files. Users are strongly encouraged to make backups.
 </para>
 <para>
@@ -206,9 +207,11 @@
 attached to the computer. Options include:
 </para>
 <itemizedlist>
-<listitem><para>Writable CDs and DVDs</para></listitem>
-<listitem><para>External hard disks and flash memory devices</para></listitem>
-<listitem><para>Another computer on the network</para></listitem>
+<listitem><para>Writable <acronym>CD</acronym>s and <acronym>DVD</acronym>s.
+</para></listitem>
+<listitem><para>External hard disks.</para></listitem>
+<listitem><para>Flash memory devices.</para></listitem>
+<listitem><para>Another computer on the network.</para></listitem>
 </itemizedlist>
 <para>
 A simple way of backing up your files is to copy them manually to a safe
@@ -217,7 +220,7 @@
 </para>
 <para>
 Another backup method is <application>Keep</application>, an automated &kubuntu;
-backup solution, preferred by many &kubuntu; veterans. To install the
+backup solution preferred by many &kubuntu; veterans. To install the
 <application>Keep</application> package, please refer to the <ulink
 type="help" url="help:/kubuntu/manage-software/">Adding Applications</ulink>
 document for help on installing applications. Once installed,
 
=== modified file 'docs/video/C/video.xml'
--- docs/video/C/video.xml	2011-09-15 06:32:00 +0000
+++ docs/video/C/video.xml	2012-03-22 07:41:34 +0000
@@ -21,14 +21,15 @@
 <sect1 id="introduction">
 <title>Introduction</title>
 <para>
-&kubuntu; comes with a video player installed by default called
-<application>Dragon Player</application>. It is a simple and lightweight video
+&kubuntu; comes with a video player installed by default called 
+<application>Dragon Player</application>. It is a simple and light-weight video 
 player that can play almost any video file (provided the necessary codecs are
-installed). For video editing, the preferred choice is
-<application>Kino</application>, a non-linear video editor.
-<application>Kino</application> is not installed by default with &kubuntu;, but
-it can be easily installed from the &kubuntu; Software Center:
-(<application>Muon</application>).
+installed). For video editing, the preferred choice is 
+<application>Kino</application> &mdash; a non-linear video editor. 
+<application>Kino</application> is not installed by default in &kubuntu;, but 
+can be easily installed from the &kubuntu; Software Center: 
+(<application>Muon</application>), which can be started by choosing 
+&menusysmuon;.
 </para>
 </sect1>
 
@@ -41,16 +42,20 @@
 
 <procedure>
 <title>Open Files From The File Manager</title>
-<step><para>Open the <application>Dolphin</application> file manager.</para></step>
+<step><para>Open the <application>Dolphin</application> file manager.
+</para></step>
 <step><para>Navigate to the video file.</para></step>
-<step><para>Click on the file name to open it with the default video player (<application>Dragon Player</application>).</para></step>
+<step><para>Click on the file name to open it with the default video player 
+(<application>Dragon Player</application>).</para></step>
 </procedure>
 
 <procedure>
 <title>Open Files From Within Dragon Player</title>
-<step><para>Open <application>Dragon Player</application>; &menudragon;</para></step>
-<step><para>Click on the <guibutton>Play File</guibutton> button or press <keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
-<step><para>Navigate to the selected video file, and click
+<step><para>Open <application>Dragon Player</application>; &menudragon;</para>
+</step>
+<step><para>Click on the <guibutton>Play File</guibutton> button or press 
+<keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
+<step><para>Navigate to the selected video file, and click 
 <guibutton>Open</guibutton></para></step>
 </procedure>
 
@@ -61,11 +66,11 @@
 <title>Editing Videos</title>
 <para>
 Video editing in &kubuntu; can be done with an application called
-<application>Kino</application> a non-linear video editor.
+<application>Kino</application> &mdash; a non-linear video editor.
 <application>Kino</application> is not installed by default. It can be
-installed using <application>Muon</application> by going
-to &menusysmuon;.</para>
-<para>Here's how to open and edit video files in
+installed using <application>Muon</application> by going to &menusysmuon;.
+</para>
+<para>Here's how to open and edit video files in 
 <application>Kino</application>:
 </para>
 
@@ -84,11 +89,12 @@
 <para>To trim a video to shorten it or to export different sections:</para>
 <procedure>
 <title>Trimming Videos</title>
-<step><para>Once a video file has been imported into
+<step><para>Once a video file has been imported into 
 <application>Kino</application>, click on the <guibutton>Trim</guibutton>
 button.</para></step>
-<step><para>A slider below the video preview can be used to specify the starting
-(In Point) and the ending (Out Point) points of the trimmed video.</para></step>
+<step><para>A slider below the video preview can be used to specify the 
+starting (In Point) and the ending (Out Point) points of the trimmed video.
+</para></step>
 <step><para>Specify the starting and ending points by dragging each end of the
 slider.</para></step>
 <step><para>After the sliders have been positioned, press the
@@ -98,21 +104,20 @@
 
 <procedure>
 <title>Exporting videos</title>
-<step><para>When the editing, trimming, etc. are complete, the video is ready
-to be exported. To do this, click on the <guibutton>Export</guibutton> on the
-right side of the window or go to
-<menuchoice><guimenu>View</guimenu><guisubmenu>Export</guisubmenu></menuchoice
->.</para></step>
+<step><para>When the editing, trimming, etc., are complete, the video is ready
+to be exported. To do this, click on the <guibutton>Export</guibutton> button 
+on the right side of the window or go to <menuchoice><guimenu>View</guimenu>
+<guisubmenu>Export</guisubmenu></menuchoice>.</para></step>
 <step><para>In the Export mode, the output mode can be specified for saving the
-edited video. Exporting to a 'DV' file maintains the quality of the video (this
-generally results in a large file).</para></step>
+edited video. Exporting to a '<acronym>DV</acronym>' file maintains the quality 
+of the video (this generally results in a large file).</para></step>
 <step><para>To export the video to a common format such as
 <acronym>AVI</acronym>, select the 'Other' tab and specify the type of video to
-export, the quality of the output video and the location where the
-video should be saved.</para></step>
+export, the quality of the output video and the location the video should be 
+saved to.</para></step>
 <step><para>When the settings have been customized, click on the
-<guibutton>Export</guibutton> button to export the file. This may take some time
-depending on the size of file, the format, the quality selected and other
+<guibutton>Export</guibutton> button to export the file. This may take some 
+time depending on the size of file, the format, the quality selected, and other
 customization choices.</para></step>
 </procedure>
 </sect1>
@@ -120,14 +125,15 @@
 <sect1 id="video-codecs">
 <title>Video Codecs</title>
 <para>
-Codecs are software that allow different types of video/audio files to be
-played. Some codecs are proprietary, meaning that a license is required to use
-them. Some codecs are available under free licenses like GPL.
+Codecs are software that allow different types of video/audio files to be 
+played. Some codecs are proprietary &mdash; meaning that a license is required 
+to use them. Some codecs are available under free licenses like the 
+<acronym>GPL</acronym>.
 </para>
 <para>
 &kubuntu; does not come pre-installed with codecs to play proprietary formats
-like mp3, rm (Real Media) and others. The necessary codecs can be installed from
-the repositories.
+like mp3, rm (<trademark>Real Media</trademark>), and others. The necessary 
+codecs can be installed from the repositories.
 </para>
 <para>
 For more information on which formats are supported out of the box by &kubuntu;