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

[Little Girl]

* Added a couple of entities.
* Fixed some grammar.
* Fixed some punctuation.
* Fixed some tags.
* Rewrapped some lines.

=== 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 06:10:23 +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 06:10:23 +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>