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

[Little Girl]

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

=== 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 19:19:20 +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 19:19:20 +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 19:19:20 +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/media/C/media.xml'
--- docs/media/C/media.xml	2010-03-27 04:09:39 +0000
+++ docs/media/C/media.xml	2012-03-22 19:19:20 +0000
@@ -14,7 +14,7 @@
 <abstract>
 <para>
 This document provides information concerning the types of media that can be
-used with &kubuntu; as well as how to write to the media.
+used with &kubuntu;, as well as how to write to the media.
 </para>
 </abstract>
 </articleinfo>
@@ -23,20 +23,23 @@
 <title>Introduction</title>
 <para>
 &kubuntu; supports many types of media with a standard installation, including
-USB hard drives, USB flash drives, internal and external CDROMs, CDs, DVDs, and
-more.
+<acronym>USB</acronym> hard drives, <acronym>USB</acronym> flash drives, 
+internal and external <acronym>CDROM</acronym>s, <acronym>CD</acronym>s, 
+<acronym>DVD</acronym>s, and more.
 </para>
 <para>
-Most of the time, when attaching media such as a CD, DVD, external hard
-drive, USB flash drive, or compact flash drives, &kubuntu; automatically
-recognizes the media, displays a notification that it has recognized the media,
-and allows for an action to be selected depending on the type of media it is.
-For instance, inserting a CD or DVD would allow for it to be mounted, opened
-with <application>K3b</application> for burning if it is blank, opened with
-<application>Amarok</application> if it is an audio CD, or opened with
-<application>Dragon Player</application> if it is a DVD. To
-see the actions available, <mousebutton>click</mousebutton> the media icon to
-the left of the media that has been recognized.
+Most of the time, when attaching media such as a <acronym>CD</acronym>, 
+<acronym>DVD</acronym>, external hard drive, <acronym>USB</acronym> flash 
+drive, or compact flash drive, &kubuntu; automatically recognizes the media, 
+displays a notification that it has recognized the media, and allows for an 
+action to be selected depending on the type of media it is. For instance, 
+inserting a <acronym>CD</acronym> or <acronym>DVD</acronym> would allow for it 
+to be mounted, opened with <application>K3b</application> for burning if it is 
+blank, opened with <application>Amarok</application> if it is an audio 
+<acronym>CD</acronym>, or opened with <application>Dragon Player</application> 
+if it is a <acronym>DVD</acronym>. To see the actions available, 
+<mousebutton>click</mousebutton> the media icon to the left of the media that 
+has been recognized.
 </para>
 <para>
 <example><title>Media recognized with options</title>
@@ -50,25 +53,28 @@
 </sect1>
 
 <sect1 id="iso">
-<title>ISO Images</title>
+<title><acronym>ISO</acronym> Images</title>
 <para>
 An <acronym>ISO</acronym> image is an archive file that is formatted to be used
-with CDs or DVDs. &kubuntu; is easily acquired as an <acronym>ISO</acronym> file
-and then burned to either a CD, DVD, or written to a USB flash drive in a
-bootable format. Review the <link linkend="write-cd-dvd">Write to CDs or
-DVDs</link> section or the section on creating <link linkend="usb">Bootable ISO
-Images From USB Media</link> for further information.
+with <acronym>CD</acronym>s or <acronym>DVD</acronym>s. &kubuntu; is easily 
+acquired as an <acronym>ISO</acronym> file and then burned to either a 
+<acronym>CD</acronym>, <acronym>DVD</acronym>, or written to a 
+<acronym>USB</acronym> flash drive in a bootable format. Review the <link 
+linkend="write-cd-dvd">Write to <acronym>CD</acronym>s or 
+<acronym>DVD</acronym>s</link> section or the section on creating <link 
+linkend="usb">Bootable <acronym>ISO</acronym> Images From <acronym>USB</acronym> 
+Media</link> for further information.
 </para>
 </sect1>
 
 <sect1 id="write-cd-dvd">
-<title>Write to CDs or DVDs</title>
+<title>Write to <acronym>CD</acronym>s or <acronym>DVD</acronym>s</title>
 <para>
 &kubuntu; ships with <application>K3b</application>, a <acronym>CD</acronym> and
 <acronym>DVD</acronym> creator. With <application>K3b</application>, it is
 possible to create a data or audio project, copy a <acronym>CD</acronym> or
 <acronym>DVD</acronym>, format or erase a rewritable disk, as well as rip audio
-and video <acronym>CD</acronym>&apos; and <acronym>DVD</acronym>&apos;s.
+and video <acronym>CD</acronym>s and <acronym>DVD</acronym>s.
 </para>
 <variablelist><title>Copy, create, and burn</title>
 <varlistentry><term>New data project</term>
@@ -85,11 +91,11 @@
 <varlistentry><term>New audio CD project</term>
 <listitem>
 <para>
-<mousebutton>Click</mousebutton> the <guibutton>New Audio CD Project</guibutton>
-button to get started. This action allows audio file drag-and-drop onto a
-<acronym>CD</acronym> that can be played in a home stereo or automobile.
-When all files have been copied over, press the <guibutton>Burn</guibutton>
-button to write the audio to the disk.
+<mousebutton>Click</mousebutton> the <guibutton>New Audio CD 
+Project</guibutton> button to get started. This action allows audio file 
+drag-and-drop onto a <acronym>CD</acronym> that can be played in a home stereo 
+or automobile. When all files have been copied over, press the 
+<guibutton>Burn</guibutton> button to write the audio to the disk.
 </para>
 </listitem>
 </varlistentry>
@@ -97,7 +103,7 @@
 <listitem>
 <para>
 <mousebutton>Click</mousebutton> the <guibutton>Copy Medium...</guibutton>
-button to to copy a <acronym>CD</acronym> to a <acronym>CD</acronym> or copy a
+button to copy a <acronym>CD</acronym> to a <acronym>CD</acronym> or copy a
 <acronym>DVD</acronym> to a <acronym>DVD</acronym>. To start the copying
 process, simply <mousebutton>click</mousebutton> the
 <guibutton>Start</guibutton> button.
@@ -129,8 +135,9 @@
 <para>
 Go to <menuchoice><guimenu>Tools</guimenu><guimenuitem>Rip Audio
 CD...</guimenuitem></menuchoice> to rip an audio <acronym>CD</acronym> to files
-in Ogg, MP3, or other format that you choose. To start the rip,
-<mousebutton>click</mousebutton> the <guibutton>Start</guibutton> button.
+in <trademark>Ogg</trademark>, <trademark>MP3</trademark>, or other format that 
+you choose. To start the rip, <mousebutton>click</mousebutton> the 
+<guibutton>Start</guibutton> button.
 </para>
 </listitem>
 </varlistentry>
@@ -138,13 +145,13 @@
 <listitem>
 <para>
 Go to <menuchoice><guimenu>Tools</guimenu><guimenuitem>Rip Video
-CD...</guimenuitem></menuchoice> to rip a video <acronym>CD</acronym> as a local
-file. To start the rip, <mousebutton>click</mousebutton> the
+CD...</guimenuitem></menuchoice> to rip a video <acronym>CD</acronym> as a 
+local file. To start the rip, <mousebutton>click</mousebutton> the
 <guibutton>Start</guibutton> button.
 </para>
 </listitem>
 </varlistentry>
-<varlistentry><term>Rip video DVD</term>
+<varlistentry><term>Rip video <acronym>DVD</acronym></term>
 <listitem>
 <para>
 Go to <menuchoice><guimenu>Tools</guimenu><guimenuitem>Rip Video
@@ -158,12 +165,13 @@
 </sect1>
 
 <sect1 id="usb">
-<title>Bootable ISO Images From USB Media</title>
+<title>Bootable <acronym>ISO</acronym> Images From <acronym>USB</acronym> 
+Media</title>
 <para>
 &kubuntu; ships with the application <application>Startup Disk
-Creator</application>. This application for the creation of a bootable
-<acronym>USB</acronym> flash drive to install &kubuntu;, Ubuntu, or other Linux
-distributions.
+Creator</application>. This application is for the creation of a bootable
+<acronym>USB</acronym> flash drive to install &kubuntu;, &ubuntu;, or other 
+<trademark>Linux</trademark> distributions.
 </para>
 <para>
 <example><title>Startup Disk Creator</title>
@@ -174,7 +182,8 @@
 </mediaobject>
 </example>
 </para>
-<procedure><title>Creating a bootable USB flash drive from an ISO image</title>
+<procedure><title>Creating a bootable <acronym>USB</acronym> flash drive from 
+an <acronym>ISO</acronym> image</title>
 <step>
 <para>
 Open <application>Startup Disk Creator</application> by going to
@@ -198,11 +207,10 @@
 <note><title>Before continuing on...</title>
 <para>
 If, after formatting, the device is still not showing any <guilabel>Free
-Space</guilabel>, it may be necessary to close out of <application>Startup Disk
-Creator</application>, and then physically remove the device. After physically
-removing it, wait a few seconds and then insert it back into the computer. Open
-<application>Startup Disk Creator</application> and continue with the following
-steps.
+Space</guilabel>, it may be necessary to close <application>Startup Disk 
+Creator</application> and then physically remove the device. Then wait a few 
+seconds and insert it back into the computer. Open <application>Startup Disk 
+Creator</application> and continue with the following steps:
 </para>
 </note>
 </step>
@@ -212,7 +220,7 @@
 reserved extra space</guibutton> if the <acronym>USB</acronym> flash drive will
 be used to run the &kubuntu; desktop live. Use the slider to select the amount
 of storage space. The other option, <guibutton>Discarded on shutdown, unless you
-save them elsewhere</guibutton> will not store data on the device. Use this
+save them elsewhere</guibutton>, will not store data on the device. Use this
 selection if the <acronym>USB</acronym> flash drive is only for installing the
 &kubuntu; desktop.
 </para>
@@ -220,7 +228,7 @@
 <step>
 <para>
 To start the process, <mousebutton>click</mousebutton> the <guibutton>Make
-Startup Disk</guibutton>.
+Startup Disk</guibutton> button.
 </para>
 </step>
 </procedure>

=== modified file 'docs/network/C/network.xml'
--- docs/network/C/network.xml	2010-07-23 02:20:29 +0000
+++ docs/network/C/network.xml	2012-03-22 19:19:20 +0000
@@ -14,7 +14,7 @@
 <abstract>
 <para>
 This document provides information about configuring systems to connect
-to networks, the Internet, and other machines on a shared network.
+to networks, the internet, and other machines on a shared network.
 </para>
 </abstract>
 </articleinfo>
@@ -66,9 +66,10 @@
 </step>
 <step>
 <para>
-Select the desired connection if it is available and click the
-<guibutton>Edit...</guibutton> button. If the proper connection is not
-available, click the <guibutton>Add...</guibutton> button.
+Select the desired connection if it is available and 
+<mousebutton>click</mousebutton> the <guibutton>Edit...</guibutton> button. If 
+the proper connection is not available, <mousebutton>click</mousebutton> the 
+<guibutton>Add...</guibutton> button.
 </para>
 </step>
 <step>
@@ -79,12 +80,14 @@
 </step>
 <step>
 <para>
-Enter the details and click the <guibutton>OK</guibutton> button.
+Enter the details and <mousebutton>click</mousebutton> the 
+<guibutton>OK</guibutton> button.
 </para>
 </step>
 <step>
 <para>
-Click the <guibutton>OK</guibutton> in the main window.
+<mousebutton>Click</mousebutton> the <guibutton>OK</guibutton> in the main 
+window.
 </para>
 </step>
 </procedure>
@@ -95,13 +98,13 @@
 <sect1 id="wireless">
 <title>Wireless</title>
 <para>
-In some cases, the wireless network device may need a restricted driver in
+In some cases, the wireless network device may need a restricted driver in 
 order to operate. The best way to check this is to open the application named
-<application>Jockey</application>. To open <application>Jockey</application>, go
-to &menujockey;. If the wireless network device requires a restricted driver,
-<application>Jockey</application> will provide that information and assist with
-selecting, installing and activating the proper driver. When this step is
-completed, wireless connections can be  configured. The machine must be
+<application>Jockey</application>. To open <application>Jockey</application>, 
+go to &menujockey;. If the wireless network device requires a restricted 
+driver, <application>Jockey</application> will provide that information and 
+assist with selecting, installing, and activating the proper driver. When this 
+step is completed, wireless connections can be  configured. The machine must be
 rebooted before the newly installed, restricted driver will make the wireless
 device work.
 </para>
@@ -115,27 +118,27 @@
 <step>
 <para>
 <mousebutton>Click</mousebutton> the <guiicon>NetworkManager</guiicon> in
-the System Tray area and select <guimenuitem>Manage
+the System Tray area and select <guimenuitem>Manage 
 Connections...</guimenuitem>.
 </para>
 </step>
 <step>
 <para>
-If a connection has been made previously to the selected network, connect to that
-network by clicking on it in the <guilabel>Wireless</guilabel> tab. If
-no connection has been made to the desired network previously, continue with the
-following procedure:
+If a connection has been made previously to the selected network, connect to 
+that network by <mousebutton>clicking</mousebutton> on it in the 
+<guilabel>Wireless</guilabel> tab. If no connection has been made to the 
+desired network previously, continue with the following procedure:
 </para>
 </step>
 <step>
 <para>
-Click the <guibutton>Add...</guibutton> button.
+<mousebutton>Click</mousebutton> the <guibutton>Add...</guibutton> button.
 </para>
 </step>
 <step>
 <para>
 Enter the <acronym>SSID</acronym> of the new network. It can be entered
-manually if known. If not, press the <guibutton>Scan</guibutton> button to
+manually, if known. If not, press the <guibutton>Scan</guibutton> button to
 search for the network.
 </para>
 </step>
@@ -161,8 +164,8 @@
 <sect1 id="mobile">
 <title>Mobile Broadband</title>
 <para>
-<emphasis>Mobile Broadband</emphasis> means any high speed Internet connection
-that is provided by an external device such as a <acronym>3G</acronym>
+<emphasis>Mobile Broadband</emphasis> means any high speed internet connection
+that is provided by an external device, such as a <acronym>3G</acronym>
 <acronym>USB</acronym> stick or mobile phone with built-in
 <acronym>HSPA</acronym>, <acronym>UMTS</acronym>, or <acronym>GPRS</acronym>
 data connection. Some laptops have been offered recently with mobile broadband
@@ -192,7 +195,7 @@
 </step>
 <step>
 <para>
-The <guilabel>New Mobile Broadband Connection</guilabel> Wizard will be
+The <guilabel>New Mobile Broadband Connection</guilabel> wizard will be
 displayed. Enter the device and carrier information.
 </para>
 </step>
@@ -203,9 +206,9 @@
 <sect1 id="vpn">
 <title>Virtual Private Networks (<acronym>VPN</acronym>)</title>
 <para>
-There are three types of Virtual Private Networks (<acronym>VPN</acronym>) that
-are currently supported by <application>NetworkManager</application>. It is
-important to know the type of <acronym>VPN</acronym> network in order to
+There are three types of Virtual Private Networks (<acronym>VPN</acronym>) 
+which are currently supported by <application>NetworkManager</application>. It 
+is important to know the type of <acronym>VPN</acronym> network in order to
 connect to it.
 </para>
 <procedure><title>Connecting to a VPN</title>
@@ -253,12 +256,12 @@
 </step>
 <step>
 <para>
-Click the <guilabel>DSL</guilabel> tab.
+<mousebutton>Click</mousebutton> the <guilabel>DSL</guilabel> tab.
 </para>
 </step>
 <step>
 <para>
-Click the <guilabel>Add...</guilabel> button.
+<mousebutton>Click</mousebutton> the <guilabel>Add...</guilabel> button.
 </para>
 </step>
 </procedure>

=== 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 19:19:20 +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/sharing/C/sharing.xml'
--- docs/sharing/C/sharing.xml	2010-03-26 21:38:03 +0000
+++ docs/sharing/C/sharing.xml	2012-03-22 19:19:20 +0000
@@ -13,7 +13,8 @@
 &legalnotice;
 <abstract>
 <para>
-This document explains how to share files between &kubuntu; and Windows.
+This document explains how to share files between &kubuntu; and 
+<trademark class='registered'>Windows</trademark>.
 </para>
 </abstract>
 </articleinfo>
@@ -25,17 +26,20 @@
 Computer networks are often comprised of diverse systems. While operating a
 network made up entirely of &kubuntu; desktop and server computers would
 certainly be fun, some network environments will consist of &kubuntu; and
-<trademark class='registered'>Microsoft</trademark> 
-<trademark class='registered'>Windows</trademark> systems working together. This
-section of the &kubuntu; &sg-title; introduces principles and tools used for
-configuring &kubuntu; servers to share network resources with Windows computers.
+<trademark class='registered'>Microsoft</trademark> <trademark 
+class='registered'>Windows</trademark> systems working together. This section 
+of the &kubuntu; &sg-title; introduces principles and tools used for 
+configuring &kubuntu; servers to share network resources with <trademark 
+class='registered'>Windows</trademark> computers.
 </para>
 
 <para>
-Successfully networking a &kubuntu; system with Windows clients involves
-providing and integrating services common to Windows environments. These
-services support sharing data and information about the computers and users
-on the network, and may be classified into three major categories:
+Successfully networking a &kubuntu; system with <trademark 
+class='registered'>Windows</trademark> clients involves providing and 
+integrating services common to <trademark 
+class='registered'>Windows</trademark> environments. These services support 
+sharing data and information about the computers and users on the network, and 
+may be classified into three major categories:
 </para>
 
 <itemizedlist>
@@ -48,35 +52,39 @@
 </listitem>
 <listitem>
 <para>
-<emphasis role="bold">Directory Services</emphasis>. Vital information is shared
-about the computers and users of the network with such technologies as the
-Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and Microsoft
-<trademark class='registered'>Active Directory</trademark>.
+<emphasis>Directory Services</emphasis>. Vital information is 
+shared about the computers and users of the network with such technologies as 
+the Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and 
+<trademark class='registered'>Microsoft</trademark> <trademark 
+class='registered'>Active Directory</trademark>.
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis role="bold">Authentication and Access</emphasis>. It is
-necessary to be able to establish the identity of a computer or user to
-determine the information the computer or user is authorized to access.
-Authentication and access use principles and technologies such as file
-permissions, group policies, and the Kerberos authentication service.
+<emphasis>Authentication and Access</emphasis>. It is necessary to be able to 
+establish the identity of a computer or user to determine the information the 
+computer or user is authorized to access. Authentication and access use 
+principles and technologies such as file permissions, group policies, and the 
+<trademark>Kerberos</trademark> authentication service.
 </para>
 </listitem>
 </itemizedlist>
 
 <para>
-A &kubuntu; system can provide all such capabilities for Windows clients and
-enable sharing network resources with them.  One of the principal pieces of
-software included in a &kubuntu; system for Windows networking is the Samba 
-suite of <acronym>SMB</acronym> server applications and tools.  
+A &kubuntu; system can provide all such capabilities for <trademark 
+class='registered'>Windows</trademark> clients and enable sharing network 
+resources with them.  One of the principal pieces of software included in a 
+&kubuntu; system for <trademark class='registered'>Windows</trademark> 
+networking is the <application>Samba</application> suite of 
+<acronym>SMB</acronym> server applications and tools.
 </para>
 
 <para>
-This section of the &kubuntu; &sg-title; will introduce some of the ways Samba
-is commonly used, and how to install and configure the necessary packages. 
-Additional detailed documentation and information on Samba can be found
-on the <ulink url="http://www.samba.org">Samba website</ulink>.
+This section of the &kubuntu; &sg-title; will introduce some of the ways 
+<application>Samba</application> is commonly used, and how to install and 
+configure the necessary packages. Additional detailed documentation and 
+information on <application>Samba</application> can be found on the <ulink 
+url="http://www.samba.org"><application>Samba</application> website</ulink>.
 </para>
 </sect1>
 
@@ -84,22 +92,25 @@
 <title>Samba File Server</title>
 
 <para>
-One of the most common ways to network &kubuntu; and Windows computers is to
-configure Samba as a File Server.  This section covers setting up a
-<application>Samba</application> server to share files with Windows clients.
+One of the most common ways to network &kubuntu; and <trademark 
+class='registered'>Windows</trademark> computers is to configure 
+<application>Samba</application> as a file server. This section covers setting 
+up a <application>Samba</application> server to share files with <trademark 
+class='registered'>Windows</trademark> clients.
 </para>
 
 <para>
 The server will be configured to share files with any client on the network
-without prompting for a password.  If the environment requires stricter Access
-Controls, see <xref linkend="samba-fileprint-security"/>
+without prompting for a password.  If the environment requires stricter access
+controls, see <xref linkend="samba-fileprint-security"/>.
 </para>
 
 <sect2 id="samba-fileserver-installation">
 <title>Installation</title>
 
 <para>
-The first step is to install the <application>samba</application> package.  From a terminal prompt enter:
+The first step is to install the <application>samba</application> package. From 
+a terminal prompt, enter:
 </para>
 
 <screen>
@@ -107,7 +118,8 @@
 </screen>
 
 <para>
-That's all there is to it. Samba is ready to be configured for file sharing.
+That's all there is to it. <application>Samba</application> is ready to be 
+configured for file sharing.
 </para>
 
 </sect2>
@@ -115,16 +127,18 @@
 <title>Configuration</title>
 
 <para>
-The main Samba configuration file is located in
-<filename>/etc/samba/smb.conf</filename>.  The default configuration file has a
+The main <application>Samba</application> configuration file is located in
+<filename>/etc/samba/smb.conf</filename>. The default configuration file has a
 significant number of comments in order to document various configuration
-directives.  
+directives.
 </para>
 <note>
 <para>
-Not all the available options are included in the default configuration file.  See the <filename>smb.conf</filename>
-<application>man</application> page or the 
-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink> for more details.
+Not all of the available options are included in the default configuration 
+file. See the <filename>smb.conf</filename> <application>man</application> page 
+or the <ulink 
+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
+<application>Samba</application> HOWTO Collection</ulink> for more details.
 </para>
 </note>
 
@@ -144,8 +158,8 @@
 
 <para>
 The <emphasis>security</emphasis> parameter is farther down in the [global]
-section, and is commented out by default.
-Change <emphasis>EXAMPLE</emphasis> to match the actual environment.  
+section, and is commented out by default. Change <emphasis>EXAMPLE</emphasis> 
+to match the actual environment.
 </para>
 
 </step>
@@ -169,7 +183,7 @@
 <itemizedlist>
 <listitem>
 <para>
-<emphasis>comment:</emphasis> a short description of the share.  Adjust to fit
+<emphasis>comment:</emphasis> a short description of the share. Adjust to fit
 as appropriate.
 </para>
 </listitem>
@@ -180,17 +194,19 @@
 <para>
 This example uses <filename>/srv/samba/sharename</filename> because, according
 to the  <emphasis>Filesystem Hierarchy Standard (FHS)</emphasis>, 
-<ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.
-html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink>
-is where site-specific data should be served. Technically Samba shares can be
-placed anywhere on the filesystem as long as the permissions are correct, but
-adhering to standards is recommended.
+<ulink 
+url="http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">
+/srv</ulink> is where site-specific data should be served. Technically, 
+<application>Samba</application> shares can be placed anywhere on the 
+filesystem as long as the permissions are correct, but adhering to standards is 
+recommended.
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis>browsable:</emphasis> enables Windows clients to browse the shared
-directory using <application>Windows Explorer</application>.
+<emphasis>browsable:</emphasis> enables <trademark 
+class='registered'>Windows</trademark> clients to browse the shared directory 
+using <application>Windows Explorer</application>.
 </para>
 </listitem>
 <listitem>
@@ -201,13 +217,16 @@
 </listitem>
 <listitem>
 <para>
-<emphasis>read only:</emphasis> determines if the share is read only or if write privileges are granted.  Write privileges are allowed only when the value is <emphasis>no</emphasis>, as is seen in this example.  If the value is <emphasis>yes</emphasis>, then access to the share is read only.
+<emphasis>read only:</emphasis> determines if the share is read only or if 
+write privileges are granted. Write privileges are allowed only when the value 
+is <emphasis>no</emphasis>, as is seen in this example. If the value is 
+<emphasis>yes</emphasis>, then access to the share is read only.
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis>create mask:</emphasis> determines the permissions new files will have
-when created.
+<emphasis>create mask:</emphasis> determines the permissions new files will 
+have when created.
 </para>
 </listitem>
 </itemizedlist>
@@ -217,7 +236,7 @@
 
 <para> 
 Now that <application>Samba</application> is configured, the directory needs to
-be created and the permissions changed.  From a terminal enter:
+be created and the permissions changed. From a terminal, enter:
 </para>
 
 <screen>
@@ -227,8 +246,9 @@
 
 <note>
 <para>
-The <emphasis>-p</emphasis> switch tells mkdir to create the entire directory
-tree if it doesn't exist.  Change the share name to fit the environment. 
+The <emphasis>-p</emphasis> switch tells <command>mkdir</command> to create the 
+entire directory tree if it doesn't exist. Change the share name to fit the 
+environment.
 </para>
 </note>
 
@@ -236,7 +256,8 @@
 <step>
 
 <para>
-Finally, restart the <application>samba</application> services to enable the new configuration:
+Finally, restart the <application>samba</application> services to enable the 
+new configuration:
 </para>
 
 <screen>
@@ -248,21 +269,23 @@
 
 <warning>
 <para>
-The above configuration gives all access to any client on the local network. For
-a more secure configuration, see <xref linkend="samba-fileprint-security"/>.
+The above configuration gives all access to any client on the local network. 
+For a more secure configuration, see <xref 
+linkend="samba-fileprint-security"/>.
 </para>
 </warning>
 
 <para>
-From a Windows client, it should now be possible to browse to the &kubuntu; file
-server and see the shared directory.  To check that everything is working, try
-creating a directory from Windows. 
+From a <trademark class='registered'>Windows</trademark> client, it should now 
+be possible to browse to the &kubuntu; file server and see the shared 
+directory. To check that everything is working, try creating a directory from 
+<trademark class='registered'>Windows</trademark>. 
 </para>
 
 <para>
 To create additional shares, simply create new <emphasis>[dir]</emphasis>
 sections in <filename>/etc/samba/smb.conf</filename>, and restart
-<emphasis>Samba</emphasis>.  Make sure that the directory to be shared actually
+<emphasis>Samba</emphasis>. Make sure that the directory to be shared actually
 exists and that the permissions are correct.
 </para>
 </sect2>
@@ -273,13 +296,15 @@
 <listitem>
 <para>
 For in depth Samba configurations see the 
-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba 
+HOWTO Collection</ulink>
 </para>
 </listitem>
 <listitem>
 <para>
-The guide is also available in 
-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
+The guide is also available in <ulink 
+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed 
+format</ulink>.
 </para>
 </listitem>
 <listitem>
@@ -300,45 +325,50 @@
 <title>Samba Security Modes</title>
 
 <para>
-There are two security levels available to the Common Internet Filesystem (CIFS)
-network protocol <emphasis>user-level</emphasis> and
-<emphasis>share-level</emphasis>.  Samba's <emphasis>security mode</emphasis>
-implementation allows more flexibility, providing four ways of implementing
-user-level security and one way to  implement share-level:
+There are two security levels available to the Common Internet Filesystem 
+(<acronym>CIFS</acronym>) network protocol <emphasis>user-level</emphasis> and
+<emphasis>share-level</emphasis>. <application>Samba</application>'s 
+<emphasis>security mode</emphasis> implementation allows more flexibility, 
+providing four ways of implementing user-level security and one way to 
+implement share-level:
 </para>
 
 <itemizedlist>
 <listitem>
 <para>
 <emphasis>security = user:</emphasis> requires clients to supply a username and
-password to connect to shares. Samba user accounts are separate from system
-accounts, but the <application>libpam-smbpass</application> package will sync
-system users and passwords with the Samba user database.
-</para>
-</listitem>
-<listitem>
-<para>
-<emphasis>security = domain:</emphasis> this mode allows the Samba server to
-appear to Windows clients as a Primary Domain Controller (PDC), Backup Domain
-Controller (BDC), or a Domain Member Server (DMS).  See 
-<xref linkend="samba-dc"/> for further information.
-</para>
-</listitem>
-<listitem>
-<para>
-<emphasis>security = ADS:</emphasis> allows the Samba server to join an Active
-Directory domain as a native member.  See <xref linkend="samba-ad-integration"/>
-for details.
-</para>
-</listitem>
-<listitem>
-<para>
-<emphasis>security = server:</emphasis> this mode is left over from before Samba
-could become a member server, and, due to some security issues, should not be
-used.  See the <ulink
+password to connect to shares. <application>Samba</application> user accounts 
+are separate from system accounts, but the 
+<application>libpam-smbpass</application> package will sync system users and 
+passwords with the <application>Samba</application> user database.
+</para>
+</listitem>
+<listitem>
+<para>
+<emphasis>security = domain:</emphasis> this mode allows the 
+<application>Samba</application> server to appear to <trademark 
+class='registered'>Windows</trademark> clients as a Primary Domain Controller 
+(<acronym>PDC</acronym>), Backup Domain Controller (<acronym>BDC</acronym>), or 
+a Domain Member Server (<acronym>DMS</acronym>). See <xref linkend="samba-dc"/> 
+for further information.
+</para>
+</listitem>
+<listitem>
+<para>
+<emphasis>security = ADS:</emphasis> allows the 
+<application>Samba</application> server to join an <trademark 
+class='registered'>Active Directory</trademark> domain as a native member. See 
+<xref linkend="samba-ad-integration"/> for details.
+</para>
+</listitem>
+<listitem>
+<para>
+<emphasis>security = server:</emphasis> this mode is left over from before 
+<application>Samba</application> could become a member server, and, due to some 
+security issues, should not be used. See the <ulink
 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/ServerType.
-html#id349531">Server Security</ulink> section of the Samba guide for more
-details.
+html#id349531">Server Security</ulink> section of the 
+<application>Samba</application> guide for more details.
 </para>
 </listitem>
 <listitem>
@@ -350,8 +380,8 @@
 </itemizedlist>
 
 <para>
-The preferred security mode depends on the environment and what the Samba
-server needs to accomplish.
+The preferred security mode depends on the environment and what the 
+<application>Samba</application> server needs to accomplish.
 </para>
 
 </sect2>
@@ -359,15 +389,16 @@
 <title>Security = User</title>
 
 <para>
-This section will reconfigure the Samba file and print server, from <xref
-linkend="samba-fileserver"/> and the
-<ulink type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to
-require authentication.
+This section will reconfigure the <application>Samba</application> file and 
+print server, from <xref linkend="samba-fileserver"/> and the <ulink 
+type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to require 
+authentication.
 </para>
 
 <para>
-First, install the <application>libpam-smbpass</application> package which will
-sync the system users to the Samba user database:
+First, install the <application>libpam-smbpass</application> package, which 
+will sync the system users to the <application>Samba</application> user 
+database:
 </para>
 
 <screen>
@@ -376,8 +407,9 @@
 
 <note>
 <para>
-If the <emphasis>Samba Server</emphasis> task was chosen during installation,
-<application>libpam-smbpass</application> is already installed.
+If the <emphasis><application>Samba</application> Server</emphasis> task was 
+chosen during installation, <application>libpam-smbpass</application> is 
+already installed.
 </para>
 </note>
 
@@ -391,7 +423,8 @@
 </programlisting>
 
 <para>
-Finally, restart Samba for the new settings to take effect:
+Finally, restart <application>Samba</application> for the new settings to take 
+effect:
 </para>
 
 <screen>
@@ -400,14 +433,14 @@
 
 <para>
 Now when connecting to the shared directories or printers, there will be a
-prompt for a username and password.  
+prompt for a username and password.
 </para>
 
 <note>
 <para>
-To map a network drive to the share, <quote>Reconnect at Logon</quote> should be
-checked, which will require the username and password to be entered just once,
-at least until the password changes.
+To map a network drive to the share, <quote>Reconnect at Logon</quote> should 
+be checked, which will require the username and password to be entered just 
+once &mdash; at least until the password changes.
 </para>
 </note>
 
@@ -416,47 +449,45 @@
 <title>Share Security</title>
 
 <para>
-There are several options available to increase the security for each individual
-shared directory.  Using the <emphasis>[share]</emphasis> example, this section
-will cover some common options.
+There are several options available to increase the security for each shared 
+directory. Using the <emphasis>[share]</emphasis> example, this section will 
+cover some common options.
 </para>
 
 <sect3 id="windows-networking-groups">
 <title>Groups</title>
 
 <para>
-Groups define a collection of computers or users which have a common level of
+Groups define a collection of computers or users who have a common level of
 access to particular network resources and offer a level of granularity in
-controlling access to such resources.  For example, if a group 
-<emphasis role="italic">qa</emphasis> is defined and contains the users
-<emphasis role="italic">freda</emphasis>, <emphasis
-role="italic">danika</emphasis>, and <emphasis role="italic">rob</emphasis> and
-a second group <emphasis role="italic">support</emphasis> is defined and
-consists of users <emphasis role="italic">danika</emphasis>,
-<emphasis role="italic">jeremy</emphasis>, and <emphasis
-role="italic">vincent</emphasis>, then certain network resources configured to
-allow access by the <emphasis role="italic">qa</emphasis> group will
-subsequently enable access by freda, danika, and rob, but not jeremy or
-vincent. Since the user <emphasis role="italic">danika</emphasis>
-belongs to both the <emphasis role="italic">qa</emphasis> and <emphasis
+controlling access to such resources. For example, if a group <emphasis 
+role="italic">qa</emphasis> is defined and contains the users <emphasis 
+role="italic">freda</emphasis>, <emphasis role="italic">danika</emphasis>, and 
+<emphasis role="italic">rob</emphasis>, and a second group <emphasis 
+role="italic">support</emphasis> is defined and consists of users <emphasis 
+role="italic">danika</emphasis>, <emphasis role="italic">jeremy</emphasis>, and 
+<emphasis role="italic">vincent</emphasis>, then certain network resources 
+configured to allow access by the <emphasis role="italic">qa</emphasis> group 
+will subsequently enable access by freda, danika, and rob, but not jeremy or
+vincent. Since the user <emphasis role="italic">danika</emphasis> belongs to 
+both the <emphasis role="italic">qa</emphasis> and <emphasis 
 role="italic">support</emphasis> groups, she will be able to access resources
 configured for access by both groups, whereas all other users will have only
 access to resources explicitly allowing the group they are part of.
 </para>
 
-
 <para>
-By default Samba looks for the local system groups defined in
-<filename>/etc/group</filename> to determine which users belong to which
-groups. For more information on adding and removing users from groups see 
-<ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
+By default, <application>Samba</application> looks for the local system groups 
+defined in <filename>/etc/group</filename> to determine which users belong to 
+which groups. For more information on adding and removing users from groups, 
+see <ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
 </para>
 
 <para>
-When defining groups in the Samba configuration file, 
-<filename>/etc/samba/smb.conf</filename>, the recognized syntax 
-is to preface the group name with an "@" symbol.  For example, to define a group
-named <emphasis role="italic">sysadmin</emphasis> in a certain section of the
+When defining groups in the <application>Samba</application> configuration 
+file, <filename>/etc/samba/smb.conf</filename>, the recognized syntax is to 
+preface the group name with an "@" symbol. For example, to define a group named 
+<emphasis role="italic">sysadmin</emphasis> in a certain section of the 
 <filename>/etc/samba/smb.conf</filename>, the group name would be entered as
 <emphasis role="bold">@sysadmin</emphasis>.
 </para>
@@ -466,19 +497,19 @@
 <title>File Permissions</title>
 
 <para>
-File Permissions define the explicit rights a computer or user has to a
-particular directory, file, or set of files.  Such permissions may be defined by
+File permissions define the explicit rights a computer or user has to a 
+particular directory, file, or set of files. Such permissions may be defined by
 editing the <filename>/etc/samba/smb.conf</filename> file and specifying the
 explicit permissions of a defined file share.
 </para>
 
 <para>
-For example, for a defined Samba share called <emphasis>share</emphasis> and
-the need to give <emphasis role="italic">read-only</emphasis> permissions to the
-group of users known as <emphasis role="italic">qa</emphasis>, while allowing
-write permissions to the share by the group called 
-<emphasis role="italic">sysadmin</emphasis> and the user named <emphasis
-role="italic">vincent</emphasis>,  then the
+For example, for a defined <application>Samba</application> share called 
+<emphasis>share</emphasis> and the need to give <emphasis 
+role="italic">read-only</emphasis> permissions to the group of users known as 
+<emphasis role="italic">qa</emphasis>, while allowing write permissions to the 
+share by the group called <emphasis role="italic">sysadmin</emphasis> and the 
+user named <emphasis role="italic">vincent</emphasis>, then the 
 <filename>/etc/samba/smb.conf</filename> file could be edited to add the
 following entries under the <emphasis>[share]</emphasis> entry:
 </para>
@@ -489,11 +520,11 @@
 </programlisting>
 
 <para>
-Another possible Samba permission is to declare
-<emphasis>administrative</emphasis> permissions to a particular shared resource.
-Users having administrative permissions may read, write, or modify any
-information contained in the resource where the user has been given explicit
-administrative permissions.
+Another possible <application>Samba</application> permission is to declare 
+<emphasis>administrative</emphasis> permissions to a particular shared 
+resource. Users having administrative permissions may read, write, or modify 
+any information contained in the resource where they have been given 
+explicit administrative permissions.
 </para>
 
 <para>
@@ -508,7 +539,8 @@
 </programlisting>
 
 <para>
-After editing <filename>/etc/samba/smb.conf</filename>, restart Samba for the changes to take effect:
+After editing <filename>/etc/samba/smb.conf</filename>, restart 
+<application>Samba</application> for the changes to take effect:
 </para>
 
 <screen>
@@ -518,21 +550,25 @@
 <note>
 <para>
 For the <emphasis>read list</emphasis> and <emphasis>write list</emphasis> to
-work the Samba security mode must <emphasis>not</emphasis> be set to <emphasis
-role="italic">security = share</emphasis>
+work, the <application>Samba</application> security mode must 
+<emphasis>not</emphasis> be set to <emphasis role="italic">security = 
+share</emphasis>.
 </para>
 </note> 
 
 <para>
-Now that Samba has been configured to limit which groups have access to the
-shared directory, the filesystem permissions need to be updated.
+Now that <application>Samba</application> has been configured to limit which 
+groups have access to the shared directory, the filesystem permissions need to 
+be updated.
 </para>
 
 <para>
-Traditional Linux file permissions do not map well to Windows NT Access Control
-Lists (ACLs).  Fortunately POSIX ACLs are available on &kubuntu; servers
-providing more fine grained control.  For example, to enable ACLs on  
-<filename>/srv</filename> an EXT3 filesystem, edit
+Traditional <trademark>Linux</trademark> file permissions do not map well to 
+<trademark class='registered'>Windows NT Access Control Lists</trademark> 
+(<acronym>ACL</acronym>s).  Fortunately <trademark>POSIX</trademark> 
+<acronym>ACL</acronym>s are available on &kubuntu; servers providing more 
+fine-grained control.  For example, to enable <acronym>ACL</acronym>s on  
+<filename>/srv</filename> an <trademark>EXT3</trademark> filesystem, edit
 <filename>/etc/fstab</filename> adding the <emphasis>acl</emphasis> option:
 </para>
 
@@ -551,18 +587,20 @@
 
 <note>
 <para>
-The above example assumes <filename>/srv</filename> on a separate partition.  If <filename>/srv</filename>,
-or wherever the share path is configured, is part of the <filename>/</filename>
-partition, a reboot may be required.
+The above example assumes <filename>/srv</filename> is on a separate partition. 
+If <filename>/srv</filename> &mdash; or wherever the share path is configured 
+&mdash; is part of the <filename>/</filename> partition, a reboot may be 
+required.
 </para>
 </note>
 
 <para>
-To match the Samba configuration above, the <emphasis>sysadmin</emphasis> group
-will be given read, write, and execute permissions to
-<filename>/srv/samba/share</filename>, the <emphasis>qa</emphasis> group will be
-given read and execute permissions, and the files will be owned by the username
-<emphasis>melissa</emphasis>.  Enter the following in a terminal:
+To match the <application>Samba</application> configuration above, the 
+<emphasis>sysadmin</emphasis> group will be given read, write, and execute 
+permissions to <filename>/srv/samba/share</filename>, the 
+<emphasis>qa</emphasis> group will be given read and execute permissions, and 
+the files will be owned by the username <emphasis>melissa</emphasis>. Enter the 
+following in a terminal:
 </para>
 
 <screen>
@@ -575,15 +613,16 @@
 <para>
 The <application>setfacl</application> command above gives
 <emphasis>execute</emphasis> permissions to all files in the
-<filename>/srv/samba/share</filename> directory, which may or may not be
+<filename>/srv/samba/share</filename> directory, which may or may not be 
 desirable.
 </para>
 </note>
 
 <para>
-A Windows client will show that the new file permissions are implemented. See
-the  <application>acl</application> and <application>setfacl</application> man
-pages for more information on POSIX ACLs.
+A <trademark class='registered'>Windows</trademark> client will show that the 
+new file permissions are implemented. See the  <application>acl</application> 
+and <application>setfacl</application> man pages for more information on 
+<trademark>POSIX</trademark> <acronym>ACL</acronym>s.
 </para>
 
 </sect3>
@@ -593,16 +632,19 @@
 
 <para>
 &kubuntu; comes with the <application>AppArmor</application> security module,
-which provides mandatory access controls. The default AppArmor profile for Samba
-will need to be adapted to the proper configuration.  For more details on using
-AppArmor, please refer to the<ulink
-url="https://help.ubuntu.com/community/AppArmor"> wiki</ulink>
+which provides mandatory access controls. The default 
+<application>AppArmor</application> profile for 
+<application>Samba</application> will need to be adapted to the proper 
+configuration. For more details on using <application>AppArmor</application>, 
+please refer to the <ulink url="https://help.ubuntu.com/community/AppArmor">
+wiki</ulink>.
 </para>
 
 <para>
-There are default AppArmor profiles for <filename>/usr/sbin/smbd</filename> and
-<filename>/usr/sbin/nmbd</filename>, the Samba daemon binaries, as part of the
-<application>apparmor-profiles</application> packages.  To install the package,
+There are default <application>AppArmor</application> profiles for 
+<filename>/usr/sbin/smbd</filename> and <filename>/usr/sbin/nmbd</filename>, 
+the <application>Samba</application> daemon binaries, as part of the
+<application>apparmor-profiles</application> packages. To install the package 
 from a terminal prompt, enter:
 </para>
 
@@ -619,10 +661,11 @@
 <para>
 By default the profiles for <application>smbd</application> and
 <application>nmbd</application> are in <emphasis>complain</emphasis> mode,
-allowing Samba to work without modifying the profile, and only logging errors.
-To place the <application>smbd</application> profile into
-<emphasis>enforce</emphasis> mode, and have Samba work as expected, the profile
-will need to be modified to reflect any directories that are shared.
+allowing <application>Samba</application> to work without modifying the 
+profile, and only logging errors. To place the <application>smbd</application> 
+profile into <emphasis>enforce</emphasis> mode and have 
+<application>Samba</application> work as expected, the profile will need to be 
+modified to reflect any directories that are shared.
 </para>
 
 <para>
@@ -636,7 +679,7 @@
 </programlisting>
 
 <para>
-Now place the profile into <emphasis>enforce</emphasis> and reload it:
+Now place the profile into <emphasis>enforce</emphasis> mode and reload it:
 </para>
 
 <screen>
@@ -648,8 +691,8 @@
 It is now possible to read, write, and execute files in the shared directory as
 normal, and the <application>smbd</application> binary will have access to only
 the configured files and directories. Be sure to add entries for each directory
-that Samba is configured to share.  Any errors will be logged to
-<filename>/var/log/syslog</filename>.  
+that <application>Samba</application> is configured to share. Any errors will 
+be logged to <filename>/var/log/syslog</filename>.
 </para>
 
 </sect2>
@@ -659,34 +702,38 @@
 <itemizedlist>
 <listitem>
 <para>
-For in depth Samba configurations, see the 
-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
+For in depth <application>Samba</application> configurations, see the 
+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
+<application>Samba</application> HOWTO Collection</ulink>.
 </para>
 </listitem>
 <listitem>
 <para>
-The guide is also available in 
-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
+The guide is also available in <ulink 
+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed 
+format</ulink>.
 </para>
 </listitem>
 <listitem>
 <para>
 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
-Samba</ulink> is also a good reference.
+<application>Samba</application></ulink> is also a good reference.
 </para>
 </listitem>
 <listitem>
 <para>
 <ulink
 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/securing-samba.html"
->Chapter 18</ulink> of the Samba HOWTO Collection is devoted to security.
+>Chapter 18</ulink> of the <application>Samba</application> HOWTO Collection is 
+devoted to security.
 </para>
 </listitem>
 <listitem>
 <para>
-For more information on Samba and ACLs, see the
-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">Samba ACLs page
-</ulink>.
+For more information on <application>Samba</application> and ACLs, see the 
+<ulink 
+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">
+<application>Samba</application> <acronym>ACL</acronym>s page</ulink>.
 </para>
 </listitem>
 </itemizedlist>
@@ -697,27 +744,31 @@
 <title>Samba as a Domain Controller</title>
 
 <para>
-Although it cannot act as an Active Directory Primary Domain Controller (PDC), a
-Samba server can be configured to appear as a Windows NT4-style domain
-controller.  A major advantage of this configuration is the ability to
-centralize user and machine credentials.  Samba can also use multiple backends
-to store the user information.
+Although it cannot act as an <trademark class='registered'>Active Directory 
+Primary Domain Controller</trademark> (<acronym>PDC</acronym>), a 
+<application>Samba</application> server can be configured to appear as a 
+<trademark class='registered'>Windows NT</trademark>4-style domain controller. 
+A major advantage of this configuration is the ability to centralize user and 
+machine credentials. <application>Samba</application> can also use multiple 
+backends to store the user information.
 </para>
 
 <sect2 id="samba-pdc-smbpasswd">
 <title>Primary Domain Controller</title>
 
 <para>
-This section covers configuring Samba as a Primary Domain Controller (PDC) using
-the default smbpasswd backend.
+This section covers configuring <application>Samba</application> as a Primary 
+Domain Controller (<acronym>PDC</acronym>) using the default 
+<application>smbpasswd</application> backend.
 </para> 
 
 <procedure>
 <step>
 
 <para>
-Install Samba and <application>libpam-smbpass</application> to sync the user
-accounts, by entering the following in a terminal prompt:
+Install <application>Samba</application> and 
+<application>libpam-smbpass</application> to sync the user accounts, by 
+entering the following in a terminal prompt:
 </para>
 
 <screen>
@@ -728,10 +779,10 @@
 <step>
 
 <para>
-Next, configure Samba by editing <filename>/etc/samba/smb.conf</filename>. The
-<emphasis>security</emphasis> mode should be set to <emphasis
-role="italic">user</emphasis>, and the <emphasis>workgroup</emphasis> should
-relate to the organization properly:
+Next, configure <application>Samba</application> by editing 
+<filename>/etc/samba/smb.conf</filename>. The <emphasis>security</emphasis> 
+mode should be set to <emphasis role="italic">user</emphasis>, and the 
+<emphasis>workgroup</emphasis> should relate to the organization properly:
 </para>
 
 <programlisting>
@@ -744,7 +795,8 @@
 <step>
 
 <para>
-In the commented <quote>Domains</quote> section, add or uncomment the following:
+In the commented <quote>Domains</quote> section, add or uncomment the 
+following:
 </para>
 
 <programlisting>
@@ -753,22 +805,23 @@
 logon drive = H:
 logon home = \\%N\%U
 logon script = logon.cmd
-add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d /var/lib/samba -s /bin/false %u
+add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d 
+/var/lib/samba -s /bin/false %u
 </programlisting>
 
 <itemizedlist>
 <listitem>
 <para>
-<emphasis>domain logons:</emphasis> provides the netlogon service causing Samba
-to act as a domain controller.
+<emphasis>domain logons:</emphasis> provides the netlogon service causing 
+<application>Samba</application> to act as a domain controller.
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis>logon path:</emphasis> places the user's Windows profile into their
-home directory.  It is also possible to configure a
-<emphasis>[profiles]</emphasis> share placing all profiles under a single
-directory.
+<emphasis>logon path:</emphasis> places the user's <trademark 
+class='registered'>Windows</trademark> profile into their home directory. It is 
+also possible to configure a <emphasis>[profiles]</emphasis> share placing all 
+profiles under a single directory.
 </para>
 </listitem>
 <listitem>
@@ -784,20 +837,20 @@
 <listitem>
 <para>
 <emphasis>logon script:</emphasis> determines the script to be run locally once
-a user has logged in. The script needs to be placed in the
-<emphasis>[netlogon]</emphasis> share. 
+a user has logged in. The script needs to be placed in the 
+<emphasis>[netlogon]</emphasis> share.
 </para>
 </listitem>
 <listitem>
 <para>
-<emphasis>add machine script:</emphasis> a script that will automatically create
-the  <emphasis>Machine Trust Account</emphasis> needed for a workstation to join
-the domain.
+<emphasis>add machine script:</emphasis> a script that will automatically 
+create the <emphasis>Machine Trust Account</emphasis> needed for a workstation 
+to join the domain.
 </para>
 <para>
-In this example, the <emphasis>machines</emphasis> group will need to be created
-using the <application>addgroup</application> utility. See <ulink type="help"
-url="help:/kubuntu/basics/"> Basics</ulink> for details.
+In this example, the <emphasis>machines</emphasis> group will need to be 
+created using the <application>addgroup</application> utility. See <ulink 
+type="help" url="help:/kubuntu/basics/"> Basics</ulink> for details.
 </para> 
 </listitem>
 </itemizedlist>
@@ -833,7 +886,7 @@
 
 <para>
 When configured as a domain controller, a <emphasis>[netlogon]</emphasis> share
-needs to be configured.  To enable the share, uncomment:
+needs to be configured. To enable the share, uncomment:
 </para>
 
 <programlisting>
@@ -849,7 +902,7 @@
 <para>
 The original <emphasis>netlogon</emphasis> share path is
 <filename>/home/samba/netlogon</filename>, but according to the Filesystem
-Hierarchy Standard (FHS), <ulink
+Hierarchy Standard (<acronym>FHS</acronym>), <ulink
 url="http://www.pathname.com/fhs/pub/fhs-2.3.
 html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink> is the correct location
 for site-specific data provided by the system.
@@ -860,7 +913,7 @@
 <step>
 
 <para>
-Now create the <filename role="directory">netlogon</filename> directory, and an
+Now create the <filename role="directory">netlogon</filename> directory and an
 empty (for now) <filename>logon.cmd</filename> script file:
 </para> 
 
@@ -870,8 +923,9 @@
 </screen>
 
 <para>
-Any normal Windows logon script commands can be entered in
-<filename>logon.cmd</filename> to customize the client's environment.
+Any normal <trademark class='registered'>Windows</trademark> logon script 
+commands can be entered in <filename>logon.cmd</filename> to customize the 
+client's environment.
 </para>
 
 </step>
@@ -879,9 +933,9 @@
 
 <para>
 With <emphasis>root</emphasis> being disabled by default, in order to join a
-workstation to the domain, a system group must be mapped to the Windows
-<emphasis>Domain Admins</emphasis> group. Using the
-<application>net</application> utility, from a terminal enter:
+workstation to the domain, a system group must be mapped to the <trademark 
+class='registered'>Windows</trademark> <emphasis>Domain Admins</emphasis> 
+group. Using the <application>net</application> utility, from a terminal enter:
 </para>
 
 <screen>
@@ -892,9 +946,9 @@
 <note>
 <para>
 Change <emphasis role="italic">sysadmin</emphasis> to the preferred group. The
-user used to join the domain needs to be a member of the
+user used to join the domain needs to be a member of the 
 <emphasis>sysadmin</emphasis> group, as well as a member of the system
-<emphasis>admin</emphasis> group.  The <emphasis>admin</emphasis> group allows 
+<emphasis>admin</emphasis> group. The <emphasis>admin</emphasis> group allows 
 <application>sudo</application> use.
 </para>
 </note>
@@ -903,7 +957,8 @@
 <step>
 
 <para>
-Finally, restart Samba to enable the new domain controller:
+Finally, restart <application>Samba</application> to enable the new domain 
+controller:
 </para> 
 
 <screen>
@@ -914,8 +969,10 @@
 <step>
 
 <para>
-It is now possible to join Windows clients to the Domain in the same manner as
-joining them to an NT4 domain running on a Windows server.
+It is now possible to join <trademark class='registered'>Windows</trademark> 
+clients to the domain in the same manner as joining them to an <trademark 
+class='registered'>NT4</trademark> domain running on a <trademark 
+class='registered'>Windows</trademark> server.
 </para>
 
 </step>        
@@ -926,32 +983,36 @@
 <title>Backup Domain Controller</title>
 
 <para>
-With a Primary Domain Controller (PDC) on the network, it is best to have a
-Backup Domain Controller (BDC) as well. This will allow clients to authenticate
-in case the PDC becomes unavailable.
+With a Primary Domain Controller (<acronym>PDC</acronym>) on the network, it is 
+best to have a Backup Domain Controller (<acronym>BDC</acronym>) as well. This 
+will allow clients to authenticate in case the <acronym>PDC</acronym> becomes 
+unavailable.
 </para>
 
 <para>
-When configuring Samba as a BDC, there must be a way to sync account information
-with the PDC.  There are multiple ways of accomplishing this, such as
+When configuring <application>Samba</application> as a <acronym>BDC</acronym>, 
+there must be a way to sync account information with the 
+<acronym>PDC</acronym>. There are multiple ways of accomplishing this, such as
 <application>scp</application>, <application>rsync</application>, or by using
 <application>LDAP</application> as the <emphasis>passdb backend</emphasis>.
 </para>
 
 <para>
-Using LDAP is the most robust way to sync account information, because both
-domain controllers can use the same information in real time. However, setting
-up a LDAP server may be overly complicated for a small number of user and
-computer accounts. See Samba<ulink
-url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP"> LDAP</ulink> page for
-details.
+Using <application>LDAP</application> is the most robust way to sync account 
+information, because both domain controllers can use the same information in 
+real time. However, setting up an <application>LDAP</application> server may be 
+overly complicated for a small number of user and computer accounts. See 
+<application>Samba</application> <ulink 
+url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP">
+<application>LDAP</application></ulink> page for details.
 </para>
 
 <procedure>
 <step>
 
 <para>
-First, install <application>samba</application> and <application>libpam-smbpass</application>.  From a terminal enter:
+First, install <application>samba</application> and 
+<application>libpam-smbpass</application>. From a terminal, enter:
 </para>
 
 <screen>
@@ -976,7 +1037,7 @@
 <step>
 
 <para>
-In the commented <emphasis>Domains</emphasis> uncomment or add:
+In the commented <emphasis>Domains</emphasis>, uncomment or add:
 </para>
 
 <programlisting>
@@ -988,8 +1049,9 @@
 <step>
 
 <para>
-Make sure a user has rights to read the files in <filename>/var/lib/samba</filename>.  For example, to allow users in the 
-<emphasis>admin</emphasis> group to <application>scp</application> the files,
+Make sure a user has rights to read the files in 
+<filename>/var/lib/samba</filename>. For example, to allow users in the 
+<emphasis>admin</emphasis> group to <application>scp</application> the files, 
 enter:
 </para>
 
@@ -1002,7 +1064,7 @@
 
 <para>
 Next, sync the user accounts, using <application>scp</application> to copy the
-<filename>/var/lib/samba</filename> directory from the PDC:
+<filename>/var/lib/samba</filename> directory from the <acronym>PDC</acronym>:
 </para>
 
 <screen>
@@ -1012,7 +1074,8 @@
 <note>
 <para>
 Replace <emphasis>username</emphasis> with a valid username and
-<emphasis>pdc</emphasis> with the hostname or IP Address of the actual PDC. 
+<emphasis>pdc</emphasis> with the hostname or <acronym>IP</acronym> Address of 
+the actual <acronym>PDC</acronym>.
 </para>
 </note>
 
@@ -1031,16 +1094,19 @@
 </procedure>
 
 <para>
-Test that the Backup Domain controller is working by stopping the Samba daemon
-on the PDC, then trying to login to a Windows client joined to the domain.
+Test that the Backup Domain controller is working by stopping the 
+<application>Samba</application> daemon on the <application>PDC</application>, 
+then trying to login to a <trademark class='registered'>Windows</trademark> 
+client joined to the domain.
 </para>
 
 <para>
-If the <emphasis>logon home</emphasis> option has been configured as a directory
-on the PDC, and the PDC becomes unavailable, access to the user's
-<emphasis>Home</emphasis> drive will also be unavailable.  For this reason,
-it is best to configure the <emphasis>logon home</emphasis> to reside on a
-separate file server from the PDC and BDC.
+If the <emphasis>logon home</emphasis> option has been configured as a 
+directory on the <acronym>PDC</acronym>, and the <acronym>PDC</acronym> becomes 
+unavailable, access to the user's <emphasis>Home</emphasis> drive will also be 
+unavailable. For this reason, it is best to configure the <emphasis>logon 
+home</emphasis> to reside on a separate file server from the 
+<acronym>PDC</acronym> and <acronym>BDC</acronym>.
 </para>
 
 </sect2>
@@ -1051,36 +1117,38 @@
 <itemizedlist>
 <listitem>
 <para>
-For in depth Samba configurations see the 
-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
+For indepth <application>Samba</application> configurations, see the <ulink 
+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
+<application>Samba</application> HOWTO Collection</ulink>.
 </para>
 </listitem>
 <listitem>
 <para>
-The guide is also available in 
-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
+The guide is also available in <ulink 
+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format
+</ulink>.
 </para>
 </listitem>
 <listitem>
 <para>
 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
-Samba</ulink> is also a good reference.
+<application>Samba</application></ulink> is also a good reference.
 </para>
 </listitem>
 <listitem>
 <para>
 <ulink
 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-pdc.html">
-Chapter 4</ulink> of the Samba HOWTO Collection explains setting up a Primary
-Domain Controller.
+Chapter 4</ulink> of the <application>Samba</application> HOWTO Collection 
+explains setting up a Primary Domain Controller.
 </para>
 </listitem>
 <listitem>
 <para>
 <ulink
 url="http://us3.samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-bdc.html">
-Chapter 5</ulink> of the Samba HOWTO Collection explains setting up a Backup
-Domain Controller.
+Chapter 5</ulink> of the <application>Samba</application> HOWTO Collection 
+explains setting up a Backup Domain Controller.
 </para>
 </listitem>
 </itemizedlist>
@@ -1095,14 +1163,16 @@
 <title>Accessing a Samba Share</title>
 
 <para>
-Another use for Samba is to integrate into an existing Windows network.  Once
-part of an Active Directory (AD) domain, Samba can provide file and print
-services to AD users.
+Another use for <application>Samba</application> is to integrate into an 
+existing <trademark class='registered'>Windows</trademark> network. Once part 
+of an <trademark class='registered'>Active Directory</trademark> 
+(<acronym>AD</acronym>) domain, <application>Samba</application> can provide 
+file and print services to <acronym>AD</acronym> users.
 </para> 
 
 <para>
-The simplest way to join an AD domain is to use
-<application>Likewise-open</application>.  For detailed instructions, see <xref
+The simplest way to join an <acronym>AD</acronym> domain is to use
+<application>Likewise-open</application>. For detailed instructions, see <xref
 linkend="likewise-open"/>.
 </para>
 
@@ -1115,13 +1185,15 @@
 </screen>
 
 <para>
-Since the <application>likewise-open</application> and <application>samba</application> packages use separate 
+Since the <application>likewise-open</application> and 
+<application>samba</application> packages use separate 
 <filename>secrets.tdb</filename> files, a symlink must be created in <filename
 role="directory">/var/lib/samba</filename>:
 </para>
 
 <screen>
-<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig</command>
+<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig
+</command>
 <command>sudo ln -s /etc/samba/secrets.tdb /var/lib/samba</command>
 </screen>
 
@@ -1150,10 +1222,10 @@
 
 <para>
 It should now be possible to access any <application>Samba</application> shares
-from a Windows client. However, be sure to give the appropriate AD users or
-groups access to the share directory.  See <xref
-linkend="samba-fileprint-security"/> for 
-more details.
+from a <trademark class='registered'>Windows</trademark> client. However, be 
+sure to give the appropriate <acronym>AD</acronym> users or groups access to 
+the share directory.  See <xref linkend="samba-fileprint-security"/> for more 
+details.
 </para>
 
 </sect2>
@@ -1162,23 +1234,25 @@
 <title>Accessing a Windows Share</title>
 
 <para>
-Now that the Samba server is part of the Active Directory domain, any Windows
-server shares can be accessed:
+Now that the <application>Samba</application> server is part of the <trademark 
+class='registered'>Active Directory</trademark> domain, any <trademark 
+class='registered'>Windows</trademark> server shares can be accessed:
 </para>
 
 <itemizedlist>
 <listitem>
 
 <para>
-To mount a Windows file share, enter the following in a terminal prompt:
+To mount a <trademark class='registered'>Windows</trademark> file share, enter 
+the following in a terminal prompt:
 </para>
 <screen>
 <command>mount.cifs //fs01.example.com/share mount_point</command>
 </screen>
 
 <para>
-It is also possible to access shares on computers not part of an AD domain, but
-a username and password must be provided.
+It is also possible to access shares on computers not part of an 
+<acronym>AD</acronym> domain, but a username and password must be provided.
 </para>
 
 </listitem>
@@ -1186,7 +1260,7 @@
 
 <para>
 To mount the share during boot, place an entry in
-<filename>/etc/fstab</filename>, for example:
+<filename>/etc/fstab</filename>. For example:
 </para>
 
 <programlisting>
@@ -1197,9 +1271,10 @@
 <listitem>
 
 <para>
-Another way to copy files from a Windows server is to use the
-<application>smbclient</application> utility.  To list the files in a Windows
-share:
+Another way to copy files from a <trademark 
+class='registered'>Windows</trademark> server is to use the
+<application>smbclient</application> utility. To list the files in a <trademark 
+class='registered'>Windows</trademark> share:
 </para>
 
 <screen>
@@ -1229,11 +1304,13 @@
 </para>
 
 <screen>
-<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"</command>
+<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"
+</command>
 </screen>
 
 <para>
-This will copy the <filename>/etc/hosts</filename> to <filename>//fs01.example.com/share/hosts</filename>.
+This will copy the <filename>/etc/hosts</filename> to 
+<filename>//fs01.example.com/share/hosts</filename>.
 </para>
 
 </listitem>
@@ -1241,10 +1318,11 @@
 
 <para>
 The <emphasis>-c</emphasis> option used above allows execution of the
-<application>smbclient</application> command all at once.  This is useful for
-scripting and minor file operations.  To enter the <emphasis>smb:
-\&gt;</emphasis> prompt, an FTP-like prompt where normal file and directory
-commands can be executed, simply run the following in Konsole:
+<application>smbclient</application> command all at once. This is useful for 
+scripting and minor file operations. To enter the <emphasis>smb:
+\&gt;</emphasis> prompt, an <acronym>FTP</acronym>-like prompt where normal 
+file and directory commands can be executed, simply run the following in 
+<application>Konsole</application>:
 </para>
 
 <screen>
@@ -1256,11 +1334,12 @@
 
 <note>
 <para>
-Replace all instances of <emphasis>fs01.example.com/share</emphasis>, <emphasis>//192.168.0.5/share</emphasis>, 
+Replace all instances of <emphasis>fs01.example.com/share</emphasis>, 
+<emphasis>//192.168.0.5/share</emphasis>, 
 <emphasis>username=steve,password=secret</emphasis>, and
-<emphasis>file.txt</emphasis> with the proper server IP, hostname, 
-share name, file name, and an actual username and password with rights to the
-share.
+<emphasis>file.txt</emphasis> with the proper server <acronym>IP</acronym>, 
+hostname, share name, file name, and an actual username and password with 
+rights to the share.
 </para>
 </note>
 
@@ -1269,9 +1348,11 @@
 <title>Resources</title>
 
 <para>
-For more <application>smbclient</application> options see the man page:
+For more <application>smbclient</application> options, see the man page:
 <command>man smbclient</command>, also available
-<ulink url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">online</ulink>.
+<ulink 
+url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">
+online</ulink>.
 </para>
 
 <para>
@@ -1289,24 +1370,27 @@
 
 <para>
 <application>Likewise Open</application> simplifies the necessary configuration
-needed to authenticate a Linux machine to an Active Directory domain.  Based on
-<application>winbind</application>, the <application>likewise-open</application>
-package takes the pain out of integrating &kubuntu; authentication into an
-existing Windows network.
+needed to authenticate a <trademark>Linux</trademark> machine to an <trademark 
+class='registered'>Active Directory</trademark> domain. Based on 
+<application>winbind</application>, the 
+<application>likewise-open</application> package takes the pain out of 
+integrating &kubuntu; authentication into an existing <trademark 
+class='registered'>Windows</trademark> network.
 </para>
 
 <sect2 id="likewise-open-install">
 <title>Installation</title>
 
 <para>
-There are two ways to use Likewise Open,
+There are two ways to use Likewise Open: 
 <application>likewise-open</application> the command line utility and 
-<application>likewise-open-gui</application>.  This section focuses on the
+<application>likewise-open-gui</application>. This section focuses on the 
 command line utility.
 </para>
 
 <para>
-To install the <application>likewise-open</application> package, open a terminal prompt and enter:
+To install the <application>likewise-open</application> package, open a 
+terminal and enter:
 </para>
 
 <screen>
@@ -1322,7 +1406,7 @@
 </para>
 
 <para>
-To install <application>Likewise Open 5.0</application> enter:
+To install <application>Likewise Open 5.0</application>, enter:
 </para>
 
 <screen>
@@ -1331,8 +1415,9 @@
 
 <warning>
 <para>
-Installing likewise-open5 over an existing likewise-open (4.1) installation will
-replace it. The domain will have to be rejoined after install.
+Installing <application>likewise-open5</application> over an existing 
+<application>likewise-open</application> (4.1) installation will replace it. 
+The domain will have to be rejoined after install.
 </para>
 </warning>
 
@@ -1349,25 +1434,29 @@
 <itemizedlist>
 <listitem>
 <para>
-Access to an Active Directory user with appropriate rights to join the domain.
-</para>
-</listitem>
-<listitem>
-<para>
-The <emphasis>Fully Qualified Domain Name</emphasis> (FQDN) of the domain
-being joined. If the AD domain does not match a valid domain such as <emphasis
-role="italic">example.com</emphasis>, it is likely that it is in the form of
-<emphasis>domainname.local</emphasis>.  
-</para>
-</listitem>
-<listitem>
-<para>
-DNS for the domain set up properly.  In a production AD environment, this
-is typically the case.  Proper Microsoft DNS is needed so that client
-workstations can determine that the Active Directory domain is available.
-</para>
-<para>
-If there is not a Windows DNS server on the network, see <xref
+Access to an <trademark class='registered'>Active Directory</trademark> user 
+with appropriate rights to join the domain.
+</para>
+</listitem>
+<listitem>
+<para>
+The <emphasis>Fully Qualified Domain Name</emphasis> (<acronym>FQDN</acronym>) 
+of the domain being joined. If the <acronym>AD</acronym> domain does not match 
+a valid domain such as <emphasis role="italic">example.com</emphasis>, it is 
+likely that it is in the form of <emphasis>domainname.local</emphasis>.
+</para>
+</listitem>
+<listitem>
+<para>
+<acronym>DNS</acronym> for the domain set up properly. In a production 
+<acronym>AD</acronym> environment, this is typically the case. Proper 
+<trademark class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is 
+needed so that client workstations can determine that the <trademark 
+class='registered'>Active Directory</trademark> domain is available.
+</para>
+<para>
+If there is not a <trademark class='registered'>Windows</trademark> 
+<acronym>DNS</acronym> server on the network, see <xref
 linkend="likewise-open-ms-dns"/> for details.
 </para>
 
@@ -1390,22 +1479,23 @@
 </note>
 
 <para>
-There will be a prompt for the user's password.  If all goes well, a
+There will be a prompt for the user's password. If all goes well, a
 <emphasis>SUCCESS</emphasis> message should be printed to the console.
 </para>
 
 <note>
 <para>
-After joining the domain, it is necessary to reboot before
-attempting to authenticate against the domain.
+After joining the domain, it is necessary to reboot before attempting to 
+authenticate against the domain.
 </para>
 </note>
 
 <para>
-After successfully joining an &kubuntu; machine to an Active Directory domain,
-any valid AD user can be used to authenticate. To login, the user name must be
-entered as 'domain\username'. For example to ssh to a server joined to the
-domain, enter:
+After successfully joining an &kubuntu; machine to an <trademark 
+class='registered'>Active Directory</trademark> domain, any valid 
+<acronym>AD</acronym> user can be used to authenticate. To log in, the user 
+name must be entered as 'domain\username'. For example, to 
+<command>ssh</command> to a server joined to the domain, enter:
 </para>
 
 <screen>
@@ -1414,14 +1504,15 @@
 
 <note>
 <para>
-If configuring a Desktop, the user name will need to be prefixed with <emphasis
+If configuring a desktop, the user name will need to be prefixed with <emphasis
 role="italic">domain\</emphasis> in the graphical logon as well.
 </para>
 </note>
 
 <para>
-To make likewise-open use a default domain, the following statement can be added
-to <filename>/etc/samba/lwiauthd.conf</filename>:
+To make <application>likewise-open</application> use a default domain, the 
+following statement can be added to 
+<filename>/etc/samba/lwiauthd.conf</filename>:
 </para>
 
 <programlisting>
@@ -1439,14 +1530,14 @@
 <note>
 <para>
 Once configured for a <emphasis>default domain</emphasis>, the <emphasis
-role="italic">'domain\'</emphasis> is no longer required. Users can login using
-only their username.
+role="italic">'domain\'</emphasis> is no longer required. Users can log in 
+using only their username.
 </para>
 </note>
 
 <para>
 The <application>domainjoin-cli</application> utility can also be used to leave
-the domain.  From a terminal:
+the domain. From a terminal:
 </para>
 
 <screen>
@@ -1459,34 +1550,36 @@
 
 <para>
 The <application>likewise-open</application> package comes with a few other
-utilities that may be useful for gathering information about the Active
-Directory environment.  These utilities are used to join the machine to the
-domain, and are the same as those available in the
-<application>samba-common</application> and <application>winbind</application> 
-packages:
+utilities that may be useful for gathering information about the <trademark 
+class='registered'>Active Directory</trademark> environment. These utilities 
+are used to join the machine to the domain, and are the same as those available 
+in the <application>samba-common</application> and 
+<application>winbind</application>  packages:
 </para>
 
 <itemizedlist>
 <listitem>
 <para>
-<application>lwinet</application>:  Returns information about the network and the domain.
-</para>
-</listitem>
-<listitem>
-<para>
-<application>lwimsg</application>:  Allows interaction with the <application>likewise-winbindd</application> daemon.
-</para>
-</listitem>
-<listitem>
-<para>
-<application>lwiinfo</application>:  Displays information about various parts of
-the Domain.
+<application>lwinet</application>: Returns information about the network and 
+the domain.
+</para>
+</listitem>
+<listitem>
+<para>
+<application>lwimsg</application>: Allows interaction with the 
+<application>likewise-winbindd</application> daemon.
+</para>
+</listitem>
+<listitem>
+<para>
+<application>lwiinfo</application>: Displays information about various parts of
+the domain.
 </para>
 </listitem>
 </itemizedlist>
 
 <para>
-Please refer to each utility's man page specific for details.
+Please refer to each utility's man page for details.
 </para>
 
 </sect2>
@@ -1496,8 +1589,9 @@
 <itemizedlist>
 <listitem>  
 <para>
-If the client has trouble joining the domain, check that the Microsoft DNS is
-listed first in <filename>/etc/resolv.conf</filename>.
+If the client has trouble joining the domain, check that the <trademark 
+class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is listed first 
+in <filename>/etc/resolv.conf</filename>.
 For example:
 </para>
 
@@ -1507,26 +1601,30 @@
 </listitem>
 <listitem>  
 <para>
-For more information when joining a domain, use the <emphasis>--loglevel verbose</emphasis> or <emphasis>--advanced</emphasis> option of the 
+For more information when joining a domain, use the <emphasis>--loglevel 
+verbose</emphasis> or <emphasis>--advanced</emphasis> option of the  
 <application>domainjoin-cli</application> utility:
 </para>
 
 <screen>
-<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator</command>
+<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator
+</command>
 </screen>
 </listitem>
 <listitem>
 <para>
-If an Active Directory user has trouble logging in, check the <filename>/var/log/auth.log</filename> for details.
+If an <trademark class='registered'>Active Directory</trademark> user has 
+trouble logging in, check the <filename>/var/log/auth.log</filename> for 
+details.
 </para>
 </listitem>
 <listitem>
 <para>
-When joining an &kubuntu; Desktop workstation to a domain, it may be necessary
-to edit <filename>/etc/nsswitch.conf</filename> if the AD domain uses the
-<emphasis role="italic">.local</emphasis> syntax.  In order to join the domain,
-the <emphasis>"mdns4"</emphasis> entry should be removed from the
-<emphasis>hosts</emphasis> option.  For example:
+When joining a &kubuntu; Desktop workstation to a domain, it may be necessary
+to edit <filename>/etc/nsswitch.conf</filename> if the <acronym>AD</acronym> 
+domain uses the <emphasis role="italic">.local</emphasis> syntax. In order to 
+join the domain, the <emphasis>"mdns4"</emphasis> entry should be removed from 
+the <emphasis>hosts</emphasis> option. For example:
 </para>
 
 <programlisting>
@@ -1550,7 +1648,8 @@
 </screen>
 
 <para>
-It should now be possible to join the Active Directory domain.
+It should now be possible to join the <trademark 
+class='registered'>Active Directory</trademark> domain.
 </para>
 </listitem>
 </itemizedlist>
@@ -1560,9 +1659,10 @@
 <title>Microsoft DNS</title>
 
 <para>
-The following are instructions for installing DNS on an Active Directory domain
-controller running Windows Server 2003, but the instructions should be similar
-for other versions:
+The following are instructions for installing <acronym>DNS</acronym> on an 
+<trademark class='registered'>Active Directory</trademark> domain controller 
+running <trademark class='registered'>Windows Server 2003</trademark>, but the 
+instructions should be similar for other versions:
 </para>
 
 <!-- Translators: please check http://www.microsoft.com/language/en/us/search.mspx to see how this string is translated in Windows to your language -->
@@ -1577,41 +1677,62 @@
 This will open the <application>Server Role Management</application> utility.
 </para>
 <orderedlist>
-<listitem><para>Click <guilabel>Add or remove a role</guilabel></para></listitem>
-<listitem><para>Click Next</para></listitem>
-<listitem><para>Select "DNS Server"</para></listitem>
-<listitem><para>Click Next</para></listitem>
-<listitem><para>Click Next again to proceed </para></listitem>
-<listitem><para>Select "Create a forward lookup zone" if it is not selected.</para></listitem>
-<listitem><para>Click Next</para></listitem>
-<listitem><para>Make sure "This server maintains the zone" is selected and click Next.</para></listitem>
-<listitem><para>Enter the domain name and click Next</para></listitem>
-<listitem><para>Click Next to "Allow only secure dynamic updates"</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Add or remove a 
+role</guilabel>.</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
+</para></listitem>
+<listitem><para>Select "<acronym>DNS</acronym> Server".</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
+</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel> 
+again to proceed.</para></listitem>
+<listitem><para>Select "Create a forward lookup zone" if it is not selected.
+</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
+</para></listitem>
+<listitem><para>Make sure "This server maintains the zone" is selected and 
+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.</para></listitem>
+<listitem><para>Enter the domain name and <mousebutton>click</mousebutton> 
+<guilabel>Next</guilabel>.</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel> to 
+"Allow only secure dynamic updates".</para></listitem>
 <listitem>
 <para>
-Enter the IP for DNS servers to forward queries to, or Select "No, it should not forward queries" and click Next.
+Enter the <acronym>IP</acronym> for <acronym>DNS</acronym> servers to forward 
+queries to, or Select "No, it should not forward queries" and 
+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.
 </para>
 </listitem>
-<listitem><para>Click Finish</para></listitem>
-<listitem><para>Click Finish</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> 
+<guilabel>Finish</guilabel></para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> 
+<guilabel>Finish</guilabel></para></listitem>
 </orderedlist>
 <para>
-DNS is now installed and can be further configured using the <application>Microsoft Management Console</application> DNS snap-in.
+<acronym>DNS</acronym> is now installed and can be further configured using the 
+<application>Microsoft Management Console</application> <acronym>DNS</acronym> 
+snap-in.
 </para>
 </listitem>
 <listitem>
 <para>
-Next, configure the Server to use itself for DNS queries:
+Next, configure the server to use itself for <acronym>DNS</acronym> queries:
 <orderedlist>
-<listitem><para>Click Start</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Start</guilabel>
+</para></listitem>
 <listitem><para>Control Panel</para></listitem>
 <listitem><para>Network Connections</para></listitem>
-<listitem><para>Right Click "Local Area Connection"</para></listitem>
-<listitem><para>Click Properties</para></listitem>
-<listitem><para>Double click "Internet Protocol (TCP/IP)"</para></listitem>
-<listitem><para>Enter the Server's IP Address as the "Preferred DNS server"</para></listitem>
-<listitem><para>Click Ok</para></listitem>
-<listitem><para>Click Ok again to save the settings</para></listitem>
+<listitem><para><mousebutton>Right click</mousebutton> "Local Area Connection"
+</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> Properties</para></listitem>
+<listitem><para><mousebutton>Double click</mousebutton> "Internet Protocol 
+(<acronym>TCP</acronym>/<acronym>IP</acronym>)"</para></listitem>
+<listitem><para>Enter the server's <acronym>IP</acronym> address as the 
+"Preferred <acronym>DNS</acronym> server"</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton>
+</para></listitem>
+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton> 
+again to save the settings</para></listitem>
 </orderedlist>
 </para>
 </listitem>
@@ -1621,11 +1742,13 @@
 <title>References</title>
 
 <para>
-Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise</ulink> home page for further information.
+Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise
+</ulink> home page for further information.
 </para>	
 
 <para>
-For more <application>domainjoin-cli</application> options see the man page: <command>man domainjoin-cli</command>.
+For more <application>domainjoin-cli</application> options, see the man page: 
+<command>man domainjoin-cli</command>.
 </para>	
 
 </sect2>

=== 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 19:19:20 +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;