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

Proposed by Little Girl
Status: Merged
Merged at revision: 266
Proposed branch: lp:~littlergirl/kubuntu-docs/sharing
Merge into: lp:kubuntu-docs/precise
Diff against target: 3754 lines (+1013/-848)
6 files modified
docs/audio/C/audio.xml (+47/-45)
docs/bugs/C/bugs.xml (+215/-169)
docs/cli/C/cli.xml (+143/-158)
docs/security/C/security.xml (+45/-42)
docs/sharing/C/sharing.xml (+522/-399)
docs/video/C/video.xml (+41/-35)
To merge this branch: bzr merge lp:~littlergirl/kubuntu-docs/sharing
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+98803@code.launchpad.net

Description of the change

* Added some tags.
* Fixed some emphasis tags.
* Fixed some grammar.
* Fixed some punctuation.
* Removed some excess white space.
* Rewrapped some lines.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/audio/C/audio.xml'
2--- docs/audio/C/audio.xml 2011-12-30 16:40:04 +0000
3+++ docs/audio/C/audio.xml 2012-03-22 09:34:17 +0000
4@@ -22,20 +22,20 @@
5 <title>Playing CDs</title>
6 <para>
7 <application>Amarok</application> is the default application for playing audio
8-<acronym>CDs</acronym> in &kubuntu;. When a <acronym>CD</acronym> is inserted,
9+<acronym>CD</acronym>s in &kubuntu;. When a <acronym>CD</acronym> is inserted,
10 &kubuntu; will recognize it and display default options. To hear the content
11 with <application>Amarok</application>, select <guilabel>Play Audio CD with
12 Amarok</guilabel> and then press the <guibutton>OK</guibutton> button.
13 &kubuntu; can be configured to remember this choice every time
14 a <acronym>CD</acronym> is inserted by selecting <guilabel>Always do
15 this for this type of media</guilabel>, and pressing <guibutton>OK</guibutton>.
16-<application>Amarok</application> also offers other useful features. If connected to
17-the Internet, <application>Amarok</application> will retrieve
18+<application>Amarok</application> also offers other useful features. If
19+connected to the Internet, <application>Amarok</application> will retrieve
20 <acronym>CD</acronym> artist, title, and track data from <ulink
21 url="http://freedb.org">freedb.org</ulink>. It will also download the lyrics
22-for the current selection if they are available by choosing the
23-<guilabel>Lyrics</guilabel> tab. Other Artist information can be found on <ulink
24-url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
25+for the current selection &mdash; if they are available &mdash; by choosing the
26+<guilabel>Lyrics</guilabel> tab. Other artist information can be found on
27+<ulink url="http://www.wikipedia.org">Wikipedia</ulink> by selecting the
28 <guilabel>Artist</guilabel> tab.
29 </para>
30 </sect1>
31@@ -44,19 +44,21 @@
32 <title>Editing Audio </title>
33
34 <para>
35-For editing audio files, &kubuntu; provides <application>Sound Editor (Audacity)</application>,
36-a full-featured, free and open source software application. To use
37-<application>Sound Editor (Audacity)</application>:
38+For editing audio files, &kubuntu; provides <application>Sound Editor
39+(Audacity)</application>, a full-featured, free, and open source software
40+application. To use <application>Sound Editor (Audacity)</application>:
41 </para>
42 <procedure>
43 <step>
44 <para>
45-Install <application>Sound Editor (Audacity)</application> from the package manager (Muon)
46+Install <application>Sound Editor (Audacity)</application> from the package
47+manager (Muon).
48 </para>
49 </step>
50 <step>
51 <para>
52-Run <application>Sound Editor (Audacity)</application> by going to &menuaudacity;.
53+Run <application>Sound Editor (Audacity)</application> by going to
54+&menuaudacity;.
55 </para>
56 </step>
57 <step>
58@@ -64,8 +66,7 @@
59 Detailed instructions (including tutorials and weblinks) on using
60 <application>Sound Editor (Audacity)</application> can be found by going to
61 <menuchoice>
62-<guimenu>Help</guimenu>
63-<guisubmenu>Contents</guisubmenu>
64+<guimenu>Help</guimenu> <guisubmenu>Contents</guisubmenu>
65 </menuchoice> from within <application>Sound Editor (Audacity)</application>.
66 </para>
67 </step>
68@@ -78,7 +79,7 @@
69 <para>
70 In addition to being the default music player in &kubuntu;,
71 <application>Amarok</application> is also helpful for managing music
72-collections. Start <application>Amarok</application> by going to &menuamarok;.
73+collections. Start <application>Amarok</application> by going to &menuamarok;.
74 </para>
75 <para>
76 Another useful <application>Amarok</application> feature is the built-in ID3
77@@ -93,10 +94,11 @@
78
79 <para>
80 Another exciting <application>Amarok</application> feature is the ability to
81-play music directly from an iPod or other portable device. <application>Amarok</application> can also be
82-used to transfer music files to and from an iPod. Please refer to the <ulink
83-type="help" url="help:/amarok">Amarok Handbook</ulink> for more information on
84-transferring and managing iPod media files.
85+play music directly from an iPod or other portable device.
86+<application>Amarok</application> can also be used to transfer music files to
87+and from an iPod. Please refer to the <ulink type="help"
88+url="help:/amarok">Amarok Handbook</ulink> for more information on transferring
89+and managing iPod media files.
90 </para>
91 </sect1>
92
93@@ -105,30 +107,29 @@
94 <procedure>
95 <step>
96 <para>
97-When a blank <acronym>CD</acronym> is inserted, &kubuntu; will
98-recognize it, mount it, and then ask what to do with the <acronym>CD</acronym>.
99-Choose <guilabel>Create an audio CD with K3B</guilabel> and press
100-<guibutton>OK</guibutton>. This will open
101-<application>K3b</application>, the <acronym>CD</acronym> and
102-<acronym>DVD</acronym> Kreator, and provide various options.
103+When a blank <acronym>CD</acronym> is inserted, &kubuntu; will recognize it,
104+mount it, and then ask what to do with the <acronym>CD</acronym>. Choose
105+<guilabel>Create an audio CD with K3B</guilabel> and press
106+<guibutton>OK</guibutton>. This will open the <application>K3b</application>
107+<acronym>CD</acronym> and <acronym>DVD</acronym> creator, and provide various
108+options.
109 </para>
110 </step>
111 <step>
112 <para>
113-To start <application>K3b</application> manually, go to <guilabel>Kickoff Application
114-> Applications > Multimedia > </guilabel><application>Disk Burning (K3b)</application>.
115+To start <application>K3b</application> manually, go to &menuk3b;.
116 </para>
117 </step>
118 <step>
119 <para>
120 Select <guilabel>New Audio CD Project</guilabel> in the <guilabel>New
121-Project</guilabel> dropdown menu.
122+Project</guilabel> drop-down menu.
123 </para>
124 </step>
125 <step>
126 <para>
127 Inside <application>K3b</application>, browse and select the tracks to be
128-ripped. Then drag and drop the tracks in the white area at the bottom of the
129+ripped. Then drag and drop the tracks into the white area at the bottom of the
130 <application>K3b</application> window.
131 <mediaobject>
132 <imageobject>
133@@ -154,9 +155,10 @@
134 <itemizedlist>
135 <listitem>
136 <para>
137-<guilabel>Writing</guilabel> - provides choices related to burning an image from
138-the files selected in the previous step.
139-<note><title>No MP3 Support by Default</title>
140+<guilabel>Writing</guilabel> - provides choices related to burning an image
141+from the files selected in the previous step.
142+<note>
143+<title>No MP3 Support by Default</title>
144 <para>
145 <acronym>MP3</acronym> is a protocol restricted by patents. In order to use it
146 with <application>K3b</application>, please refer to the information at the end
147@@ -194,36 +196,36 @@
148 </step>
149 </procedure>
150 <para>
151-<application>K3b</application> can extract audio files to the following formats:
152+<application>K3b</application> can extract audio files to the following
153+formats:
154 <itemizedlist>
155 <listitem>
156 <para>
157-<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg
158-Vorbis is a patent-free lossy audio compression format which usually produces
159-higher quality and greater compression than MP3. See the <ulink
160-url="http://www.vorbis.com/faq/">Vorbis website</ulink> for more information.
161+<emphasis role="strong">Ogg Vorbis</emphasis> - Ogg Vorbis is a patent-free
162+lossy audio compression format which usually produces higher quality and
163+greater compression than MP3. See the <ulink url="http://www.vorbis.com/faq/">
164+Vorbis website</ulink> for more information.
165 </para>
166 </listitem>
167 <listitem>
168 <para><emphasis role="strong">FLAC</emphasis> - The Free Lossless Audio
169-Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without removing
170-any information from the audio stream. For more information on this format, see
171-the <ulink url="http://flac.sourceforge.net/">FLAC homepage</ulink> on
172-sourceforge.net.
173+Codec, <acronym>FLAC</acronym>, can compress audio files up to 50% without
174+removing any information from the audio stream. For more information on this
175+format, see the <ulink url="http://flac.sourceforge.net/">FLAC
176+homepage</ulink> on <trademark>Sourceforge</trademark>.
177 </para>
178 </listitem>
179 <listitem>
180-<para><emphasis role="strong">WAV</emphasis> - Wav is an
181-uncompressed audio format that can be compressed into OGG Vorbis or a codec of
182-your choice. It is often edited in applications such as Audacity before being
183-compressed.
184+<para><emphasis role="strong">WAV</emphasis> - Wav is an uncompressed audio
185+format that can be compressed into OGG Vorbis or a codec of your choice. It is
186+often edited in applications such as Audacity before being compressed.
187 </para>
188 </listitem>
189 </itemizedlist>
190 </para>
191 <para>
192 CD audio files can be extracted to the proprietary, non-free
193-<emphasis role="strong">MP3</emphasis> lossy format by using the
194+<emphasis role="strong">MP3</emphasis> lossy format by using the
195 <application>lame</application> encoder. Please refer to the <ulink type="help"
196 url="help:/kubuntu/add-applications/">Adding Applications</ulink> documentation
197 for help with installing applications such as <application>lame</application>.
198
199=== modified file 'docs/bugs/C/bugs.xml'
200--- docs/bugs/C/bugs.xml 2011-09-15 05:13:39 +0000
201+++ docs/bugs/C/bugs.xml 2012-03-22 09:34:17 +0000
202@@ -28,8 +28,8 @@
203 <varlistentry><term>Crash</term>
204 <listitem>
205 <para>
206-An application or system crash or failure. Most of the time, a crash dialog will
207-be presented that can be turned into a bug report.
208+An application or system crash or failure. Most of the time a crash dialog will
209+be presented. This can be turned into a bug report.
210 </para>
211 </listitem>
212 </varlistentry>
213@@ -59,19 +59,25 @@
214 <title>KDE's Bug Tracking System</title>
215 <para><ulink url="https://bugs.kde.org/"/></para>
216 <para>
217-KDE uses Bugzilla, a &quot;Defect Tracking System&quot;. Bugzilla is one of the
218-most popular tools used in the open source development community.
219+<trademark>KDE</trademark> uses <trademark>Bugzilla</trademark>, a
220+<quote>Defect Tracking System</quote>. <trademark>Bugzilla</trademark> is one
221+of the most popular tools used in the open source development community.
222 </para>
223 <note><title>Register first</title>
224 <para>
225-To report a bug, one must register for an account on KDE's Bugzilla
226-at <ulink url="https://bugs.kde.org/createaccount.cgi"/>. A valid email address
227-is required for registration.
228+To report a bug, one must register for an account on
229+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark> at <ulink
230+url="https://bugs.kde.org/createaccount.cgi"/>. A valid email address is
231+required for registration.
232 </para>
233 </note>
234 <note><title>Only for KDE bugs</title>
235 <para>
236-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.
237+<trademark>Bugzilla</trademark> is only for <trademark>KDE</trademark> bugs. If
238+the application is not part of <trademark>KDE</trademark> &mdash; Firefox,
239+LibreOffice, or VLC, for instance &mdash; then the report should be filed in
240+Launchpad instead. Please see the next section, which covers filing reports
241+concerning Launchpad.
242 </para>
243 </note>
244 </sect2>
245@@ -79,22 +85,24 @@
246 <title>Launchpad</title>
247 <para><ulink url="https://launchpad.net/"/></para>
248 <para>
249-Launchpad is an open source suite of tools that help people and teams to work
250-together on software projects. Launchpad is used by the Ubuntu and &kubuntu;
251-Projects, as well as various other open source projects.
252+<trademark>Launchpad</trademark> is an open source suite of tools that help
253+people and teams to work together on software projects. Launchpad is used by
254+the &ubuntu; and &kubuntu; projects, as well as various other open source
255+projects.
256 </para>
257 <note><title>Register first</title>
258 <para>
259-To report a bug, one must register for a Launchpad account at
260-<ulink url="https://launchpad.net/+login"/>. A valid email address is required
261-for registration.
262+To report a bug, one must register for a <trademark>Launchpad</trademark>
263+account at <ulink url="https://launchpad.net/+login"/>. A valid email address
264+is required for registration.
265 </para>
266 </note>
267 <note><title>For any bug in &kubuntu;</title>
268 <para>
269-Launchpad can be used to file a bug report for any application available in the
270-Ubuntu or &kubuntu; repositories. For KDE applications, the
271-KDE Bug Tracking system (above) is preferred.
272+<trademark>Launchpad</trademark> can be used to file a bug report for any
273+application available in the &ubuntu; or &kubuntu; repositories. For
274+<trademark>KDE</trademark> applications, the <trademark>KDE Bug
275+Tracking</trademark> system (above) is preferred.
276 </para>
277 </note>
278 </sect2>
279@@ -104,18 +112,19 @@
280 <title>Filing a Crash Report</title>
281 <para>
282 When an application crashes in &kubuntu;, the appropriate crash dialog will
283-appear. It is usually easy to file a bug report from the dialog. With a KDE
284-application, the KDE crash dialog will appear along with instructions
285-for reporting the bug. Otherwise, the Ubuntu crash dialog will appear with
286-instructions for filing a bug on Launchpad.
287+appear. It is usually easy to file a bug report from the dialog. With a
288+<trademark>KDE</trademark> application, the <trademark>KDE</trademark> crash
289+dialog will appear along with instructions for reporting the bug. Otherwise,
290+the &ubuntu; crash dialog will appear with instructions for filing a bug on
291+<trademark>Launchpad</trademark>.
292 </para>
293 <sect2 id="filing-crash-kde">
294 <title>KDE</title>
295 <para>
296-When an application crashes in KDE, a crash dialog will be presented that is
297-similar to the following images. The first image shows the
298-<guilabel>General</guilabel> tab which provides an overview of the crash. The
299-second image shows the <guilabel>Developer Information</guilabel> tab which
300+When an application crashes in <trademark>KDE</trademark>, a crash dialog will
301+be presented that is similar to the following images. The first image shows the
302+<guilabel>General</guilabel> tab, which provides an overview of the crash. The
303+second image shows the <guilabel>Developer Information</guilabel> tab, which
304 provides trace information that is useful to developers.
305 </para>
306 <para>
307@@ -139,10 +148,10 @@
308 </example>
309 </para>
310 <para>
311-If the trace information is deemed valuable, filing a bug report is
312-easy with the crash dialog wizard. If the trace is not deemed valuable, then it
313-is not possible to file a bug report with the wizard. The bug report can still
314-be filed manually at <ulink url="https://bugs.kde.org/"/>.
315+If the trace information is deemed valuable, filing a bug report is easy with
316+the crash dialog wizard. If the trace is not deemed valuable, then it is not
317+possible to file a bug report with the wizard. The bug report can still be
318+filed manually at <ulink url="https://bugs.kde.org/"/>.
319 </para>
320 <para>
321 To complete the bug reporting process, follow the procedure below.
322@@ -151,14 +160,15 @@
323 <step>
324 <para>
325 <mousebutton>Click</mousebutton> the <guibutton>Report Bug</guibutton> button.
326-The following dialog will appear.
327+The following dialog will appear:
328 </para>
329 <para>
330 <example>
331 <title>Welcome to the Reporting Assistant</title>
332 <mediaobject>
333 <imageobject>
334-<imagedata fileref="help:/images/C/crash_report_assistant_welcome.png" format="PNG"/>
335+<imagedata
336+fileref="help:/images/C/crash_report_assistant_welcome.png" format="PNG"/>
337 </imageobject>
338 </mediaobject>
339 </example>
340@@ -167,14 +177,15 @@
341 <step>
342 <para>
343 <mousebutton>Click</mousebutton> the <guibutton>Next</guibutton> button. The
344-following dialog will appear.
345+following dialog will appear:
346 </para>
347 <para>
348 <example>
349 <title>What do you know about the crash?</title>
350 <mediaobject>
351 <imageobject>
352-<imagedata fileref="help:/images/C/crash_report_assistant_about_crash.png" format="PNG"/>
353+<imagedata
354+fileref="help:/images/C/crash_report_assistant_about_crash.png" format="PNG"/>
355 </imageobject>
356 </mediaobject>
357 </example>
358@@ -183,15 +194,17 @@
359 <step>
360 <para>
361 Select the applicable options. The drop-down box under the question,
362-&quot;<guilabel>Does the application crash again if you repeat the
363-same situation?</guilabel>&quot; has several options.
364+<quote><guilabel>Does the application crash again if you repeat the
365+same situation?</guilabel></quote> has several options.
366 </para>
367 <para>
368 <example>
369 <title>Does the application crash again if you repeat the same situation?</title>
370 <mediaobject>
371 <imageobject>
372-<imagedata fileref="help:/images/C/crash_report_assistant_about_crash_dropdown.png" format="PNG"/>
373+<imagedata
374+fileref="help:/images/C/crash_report_assistant_about_crash_dropdown.png"
375+format="PNG"/>
376 </imageobject>
377 </mediaobject>
378 </example>
379@@ -205,18 +218,21 @@
380 </step>
381 <step>
382 <para>
383-Depending on the information available in the crash report, either of two
384+Depending on the information available in the crash report, either of two
385 dialogs will appear. One is a dialog that indicates that there is not enough
386 information to file a good report. The other is a dialog indicating that the
387-information is useful, and that it would be helpful to continue with filing the
388+information is useful and that it would be helpful to continue with filing the
389 report.
390 </para>
391 <para>
392 <example>
393-<title>Not enough information for developers to continue the reporting process</title>
394+<title>Not enough information for developers to continue the reporting
395+process</title>
396 <mediaobject>
397 <imageobject>
398-<imagedata fileref="help:/images/C/crash_report_assistant_not_enough_info.png" format="PNG"/>
399+<imagedata
400+fileref="help:/images/C/crash_report_assistant_not_enough_info.png"
401+format="PNG"/>
402 </imageobject>
403 </mediaobject>
404 </example>
405@@ -226,7 +242,9 @@
406 <title>This crash information is useful</title>
407 <mediaobject>
408 <imageobject>
409-<imagedata fileref="help:/images/C/crash_report_assistant_useful_information.png" format="PNG"/>
410+<imagedata
411+fileref="help:/images/C/crash_report_assistant_useful_information.png"
412+format="PNG"/>
413 </imageobject>
414 </mediaobject>
415 </example>
416@@ -235,7 +253,7 @@
417 <para>
418 It may be necessary to install the proper debug packages in order to get a good
419 trace. Such packages include <filename>kdebase-dbg</filename>,
420-<filename>kdebase-workspace-dbg</filename>,
421+<filename>kdebase-workspace-dbg</filename>, and
422 <filename>kdebase-runtime-dbg</filename>.
423 </para>
424 </note>
425@@ -243,36 +261,42 @@
426 <step>
427 <para>
428 If enough information was provided to continue filing a bug report using
429-the assistant, a dialog will appear to allow logging in to KDE's Bugzilla.
430+the assistant, a dialog will appear to allow logging in to
431+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark>.
432 </para>
433 <para>
434 <example>
435 <title>KDE Bug Tracking System Login</title>
436 <mediaobject>
437 <imageobject>
438-<imagedata fileref="help:/images/C/crash_report_assistant_bugtracker_login.png" format="PNG"/>
439+<imagedata
440+fileref="help:/images/C/crash_report_assistant_bugtracker_login.png"
441+format="PNG"/>
442 </imageobject>
443 </mediaobject>
444 </example>
445 </para>
446 <note><title>Use e-mail address as username</title>
447 <para>
448-Use the e-mail address that was used to register with KDE's Bugzilla.
449+Use the email address that was used to register with
450+<trademark>KDE</trademark>'s <trademark>Bugzilla</trademark>.
451 </para>
452 </note>
453 </step>
454 <step>
455 <para>
456-After logging in with username (e-mail address) and password,
457+After logging in with your username (email address) and password,
458 <mousebutton>click</mousebutton> the <guibutton>Login</guibutton> button. The
459-assistant will check for duplicates and display the following dialog.
460+assistant will check for duplicates and display the following dialog:
461 </para>
462 <para>
463 <example>
464 <title>Bug Report Possible Duplicates List</title>
465 <mediaobject>
466 <imageobject>
467-<imagedata fileref="help:/images/C/crash_report_assistant_possible_duplicates.png" format="PNG"/>
468+<imagedata
469+fileref="help:/images/C/crash_report_assistant_possible_duplicates.png"
470+format="PNG"/>
471 </imageobject>
472 </mediaobject>
473 </example>
474@@ -283,14 +307,17 @@
475 If there is a possible duplicate report, <mousebutton>click</mousebutton> the
476 report in the list and then <mousebutton>click</mousebutton> the <guibutton>Open
477 selected report</guibutton> button. Either of the following dialogs will be
478-presented.
479+presented:
480 </para>
481 <para>
482 <example>
483-<title>The report you selected is already marked as a duplicate of bug...</title>
484+<title>The report you selected is already marked as a duplicate of
485+bug...</title>
486 <mediaobject>
487 <imageobject>
488-<imagedata fileref="help:/images/C/crash_report_assistant_nested_duplicate_detected.png" format="PNG"/>
489+<imagedata
490+fileref="help:/images/C/crash_report_assistant_nested_duplicate_detected.png"
491+format="PNG"/>
492 </imageobject>
493 </mediaobject>
494 </example>
495@@ -300,7 +327,9 @@
496 <title>Showing the duplicate bug report you selected</title>
497 <mediaobject>
498 <imageobject>
499-<imagedata fileref="help:/images/C/crash_report_assistant_duplicate_report.png" format="PNG"/>
500+<imagedata
501+fileref="help:/images/C/crash_report_assistant_duplicate_report.png"
502+format="PNG"/>
503 </imageobject>
504 </mediaobject>
505 </example>
506@@ -313,23 +342,26 @@
507 bug report and inform the developers that it may be a duplicate. This is
508 recommended, except in cases with experienced users where it is clearly not a
509 duplicate. <mousebutton>Clicking</mousebutton> the <guibutton>Attach to this
510-report (Advanced)</guibutton> will attach the crash information to the report.
511+report (Advanced)</guibutton> button will attach the crash information to the
512+report.
513 </para>
514 <para>
515 If the bug is not a duplicate, simply <mousebutton>click</mousebutton>
516-the <guibutton>Next</guibutton> in the dialog showing the possible duplicates.
517-A dialog will appear with <guibutton>Let me check more reports</guibutton>. To
518-prevent checking for more reports and continue to file the report,
519-<mousebutton>click</mousebutton> the <guibutton>There
520-are no real duplicates</guibutton> button. A dialog will appear to enter
521-additional information concerning the report.
522+the <guibutton>Next</guibutton> button in the dialog showing the possible
523+duplicates. A dialog will appear with <guibutton>Let me check more
524+reports</guibutton>. To prevent checking for more reports and continue filing
525+the report, <mousebutton>click</mousebutton> the <guibutton>There
526+are no real duplicates</guibutton> button. A dialog will appear asking you to
527+enter additional information concerning the report.
528 </para>
529 <para>
530 <example>
531 <title>Details of the Bug Report</title>
532 <mediaobject>
533 <imageobject>
534-<imagedata fileref="help:/images/C/crash_report_assistant_report_details.png" format="PNG"/>
535+<imagedata
536+fileref="help:/images/C/crash_report_assistant_report_details.png"
537+format="PNG"/>
538 </imageobject>
539 </mediaobject>
540 </example>
541@@ -337,16 +369,18 @@
542 </step>
543 <step>
544 <para>
545-Once the details of the bug report are complete,
546-<mousebutton>click</mousebutton> the <guibutton>Next</guibutton> button. The
547-following dialog will be presented.
548+Once the details of the bug report are complete,
549+<mousebutton>click</mousebutton> the <guibutton>Next</guibutton> button. The
550+following dialog will be presented:
551 </para>
552 <para>
553 <example>
554 <title>Preview Report</title>
555 <mediaobject>
556 <imageobject>
557-<imagedata fileref="help:/images/C/crash_report_assistant_report_details_preview.png" format="PNG"/>
558+<imagedata
559+fileref="help:/images/C/crash_report_assistant_report_details_preview.png"
560+format="PNG"/>
561 </imageobject>
562 </mediaobject>
563 </example>
564@@ -355,14 +389,16 @@
565 <step>
566 <para>
567 If the information looks correct, <mousebutton>click</mousebutton> the
568-<guibutton>Next</guibutton> button. The following dialog will be presented.
569+<guibutton>Next</guibutton> button. The following dialog will be presented:
570 </para>
571 <para>
572 <example>
573 <title>Send Crash Report</title>
574 <mediaobject>
575 <imageobject>
576-<imagedata fileref="help:/images/C/crash_report_assistant_report_filed.png" format="PNG"/>
577+<imagedata
578+fileref="help:/images/C/crash_report_assistant_report_filed.png"
579+format="PNG"/>
580 </imageobject>
581 </mediaobject>
582 </example>
583@@ -370,18 +406,19 @@
584 </step>
585 </procedure>
586 <para>
587-<emphasis role="bold">Congratulations on a successful bug report!</emphasis>
588-Identifying and reporting bugs are essential to improving &kubuntu; and KDE.
589-Some emails may be sent to the registered address to update progress or to
590-allow developers to get additional information about the bug.
591+<emphasis>Congratulations on a successful bug report!</emphasis> Identifying
592+and reporting bugs are essential to improving &kubuntu; and
593+<trademark>KDE</trademark>. Some emails may be sent to the registered address
594+to update progress or to allow developers to get additional information about
595+the bug.
596 </para>
597 </sect2>
598 <sect2 id="filing-crash-lp">
599 <title>Launchpad</title>
600 <para>
601-When an application that is not KDE crashes in &kubuntu;, a pop-up notification
602-will appear from <application>Apport</application> that is similar to the
603-following image.
604+When an application that is not <trademark>KDE</trademark> crashes in
605+&kubuntu;, a pop-up notification will appear from
606+<application>Apport</application> that is similar to the following image:
607 </para>
608 <para>
609 <example><title>Apport Crash Pop-pup Notification</title>
610@@ -394,11 +431,11 @@
611 </para>
612 <note><title>Crash information may be different</title>
613 <para>
614-The following screen shots were created by crashing the application
615-<application>VLC</application> deliberately. Crash dialogs associated with other
616-applications will be different. In an actual bug situation, the application
617-name, <application>VLC</application>, will be replaced by the name of the
618-application that actually crashed.
619+The screen shots below were created by crashing the application
620+<application>VLC</application> deliberately. Crash dialogs associated with
621+other applications will be different. In an actual bug situation, the
622+application name, <application>VLC</application>, will be replaced by the name
623+of the application that actually crashed.
624 </para>
625 </note>
626 <para>
627@@ -409,7 +446,7 @@
628 <para>
629 <mousebutton>Click</mousebutton> the <guibutton>Details</guibutton> buttons on
630 the <application>System Notification Helper</application>. The following dialog
631-will be presented.
632+will be presented:
633 </para>
634 <para>
635 <example>
636@@ -441,11 +478,11 @@
637 </step>
638 <step>
639 <para>
640-After all of the information concerning the crash is collected, a dialog will
641-be presented that displays the details of the report, and the report is sent to
642-the developers. <mousebutton>Click</mousebutton> the
643+After all information concerning the crash is collected, a dialog will be
644+presented that displays the details of the report, and the report is sent to
645+the developers. <mousebutton>Click</mousebutton> the
646 <guibutton>Details...</guibutton> button to view details of the report. The
647-following dialog will be presented.
648+following dialog will be presented:
649 </para>
650 <para>
651 <example><title>Send problem report to the developers? (Details)</title>
652@@ -460,8 +497,8 @@
653 <step>
654 <para>
655 <mousebutton>Click</mousebutton> the <guibutton>Send</guibutton> button to send
656-the report to the developers. In this case, it will send the report to
657-Launchpad. The following progress dialog will be presented.
658+the report to the developers. In this case, it will send the report to
659+<trademark>Launchpad</trademark>. The following progress dialog will be presented:
660 </para>
661 <para>
662 <example><title>Uploading problem information</title>
663@@ -476,15 +513,16 @@
664 <step>
665 <para>
666 After the progress dialog completes, the default web browser will open to
667-Launchpad presenting either the login page or the beginning of the online
668-version of the bug reporting process. After logging in (if necessary) the
669-following page will be presented.
670+<trademark>Launchpad</trademark>, presenting either the log-in page or the
671+beginning of the online version of the bug reporting process. After logging in
672+(if necessary), the following page will be presented:
673 </para>
674 <para>
675 <example><title>Please wait while bug data is processed...</title>
676 <mediaobject>
677 <imageobject>
678-<imagedata fileref="help:/images/C/apport-browser-processing.png" format="PNG"/>
679+<imagedata fileref="help:/images/C/apport-browser-processing.png"
680+format="PNG"/>
681 </imageobject>
682 </mediaobject>
683 </example>
684@@ -492,8 +530,8 @@
685 </step>
686 <step>
687 <para>
688-When Launchpad is finished processing the bug data, the following page will be
689-presented.
690+When <trademark>Launchpad</trademark> is finished processing the bug data, the
691+following page will be presented:
692 </para>
693 <para>
694 <example><title>Extra debug information will be added...</title>
695@@ -508,7 +546,7 @@
696 <step>
697 <para>
698 <mousebutton>Click</mousebutton> the <guibutton>Next</guibutton> button. The
699-following page will be presented.
700+following page will be presented:
701 </para>
702 <para>
703 <example><title>Further information</title>
704@@ -522,10 +560,10 @@
705 </step>
706 <step>
707 <para>
708-Any extra information can be filled in about the bug report such as what was
709-being done when it crashed or the online file locations that may have caused the
710-crash. The following is a brief description filed with the report in
711-this procedure.
712+Any extra information about the bug report can be filled in to describe, for
713+example, what was being done when the application crashed or the online file
714+locations that may have caused the crash. The following is a brief description
715+filed with the report in this procedure:
716 </para>
717 <para>
718 <example><title>Further information (Completed)</title>
719@@ -540,7 +578,7 @@
720 <step>
721 <para>
722 <mousebutton>Click</mousebutton> the <guibutton>Submit Bug Report</guibutton>
723-button on the bottom of the page. The following page will be presented.
724+button on the bottom of the page. The following page will be presented:
725 </para>
726 <para>
727 <example><title>Thank you for your bug report</title>
728@@ -554,10 +592,10 @@
729 </step>
730 </procedure>
731 <para>
732-<emphasis role="bold">Congratulations on making a successful crash
733-report!</emphasis>Identifying and reporting bugs are essential to improving
734-&kubuntu;. Some emails may be sent to the registered address to update progress
735-or to allow developers to get additional information about the bug.
736+<emphasis>Congratulations on making a successful crash report!</emphasis>
737+Identifying and reporting bugs are essential to improving &kubuntu;. Some
738+emails may be sent to the registered address to update progress or to allow
739+developers to get additional information about the bug.
740 </para>
741 </sect2>
742 </sect1>
743@@ -565,32 +603,33 @@
744 <sect1 id="filing-non-crash">
745 <title>Filing a Non-Crash or Regression Report</title>
746 <para>
747-If an application has regressed in functionality, a bug report should be
748-filed on that application. A regress occurs when a function worked in a previous
749-release but in the latest release, it is not working. In most cases, this type
750-of report will be filed by those who have more experience and may be testing
751-beta quality software. However there are situations where a user needs to report
752-an issue with an application that isn't working right, but isn't crashing. The
753-following procedures will help.
754+If an application has regressed in functionality, a bug report should be filed
755+on that application. A regression occurs when a function worked in a previous
756+release, but is not working in the latest release. In most cases, this type of
757+report will be filed by those who have previous experience and may be testing
758+beta quality software. There are, however, situations where a user needs to
759+report an issue with an application that isn't working right, but isn't
760+crashing. The following procedures will help:
761 </para>
762 <sect2 id="filing-non-crash-kde">
763 <title>KDE</title>
764 <para>
765-Filing non-crash related bug reports for KDE applications are done with a web
766-browser using <ulink url="https://bugs.kde.org/"/>.
767+Filing non-crash related bug reports for <trademark>KDE</trademark>
768+applications is done with a web browser using
769+<ulink url="https://bugs.kde.org/"/>.
770 </para>
771 <note><title>Register first</title>
772 <para>
773 To report a bug, one must register for an account on the bug tracker.
774-KDE's bug tracker is located at <ulink url="https://bugs.kde.org/"/>.
775+<trademark>KDE</trademark>'s bug tracker is located at <ulink
776+url="https://bugs.kde.org/"/>.
777 </para>
778 </note>
779 <procedure><title>Filing a bug report without a crash</title>
780 <step>
781 <para>
782-In a web browser, go to <ulink url="https://bugs.kde.org/"/> and either
783-create a new account or login. Once logged in, the following page will be
784-presented.
785+In a web browser, go to <ulink url="https://bugs.kde.org/"/> and either create
786+a new account or log in. Once logged in, the following page will be presented:
787 </para>
788 <para>
789 <example><title>Welcome to the KDE Bug Tracking System</title>
790@@ -605,8 +644,8 @@
791 <step>
792 <para>
793 <mousebutton>Click</mousebutton> the <guilabel>Report New Wish or Bug</guilabel>
794-link in the top-right-hand corner of the page to start the process of filing the
795-bug report. The following page will be presented.
796+link in the top right-hand corner of the page to start the process of filing
797+the bug report. The following page will be presented:
798 </para>
799 <para>
800 <example><title>Welcome to the KDE Bug Report Wizard!</title>
801@@ -620,8 +659,8 @@
802 </step>
803 <step>
804 <para>
805-<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. The
806-following page will be presented.
807+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button.
808+The following page will be presented:
809 </para>
810 <para>
811 <example><title>Software Configuration</title>
812@@ -639,7 +678,7 @@
813 <guilabel>Distribution Method</guilabel> (Should be <guilabel>Ubuntu
814 Packages</guilabel>) from the drop-down menus. <mousebutton>Click</mousebutton>
815 the <guibutton>Continue</guibutton> button when finished with the selections.
816-The following page will be presented.
817+The following page will be presented:
818 </para>
819 <para>
820 <example><title>Application Selection</title>
821@@ -660,10 +699,10 @@
822 </step>
823 <step>
824 <para>
825-Under the <guilabel>Find</guilabel> section under the
826-<guilabel>Application</guilabel> list, fill in the <guilabel>Keyword
827+Under the <guilabel>Find</guilabel> section in the
828+<guilabel>Application</guilabel> list, fill in the <guilabel>Keyword
829 Search</guilabel> text box with the application being reported. It should look
830-similar to the following image.
831+similar to the following image:
832 </para>
833 <para>
834 <example><title>Application Selection (Search for application)</title>
835@@ -681,8 +720,8 @@
836 </step>
837 <step>
838 <para>
839-<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button. The
840-following page will be presented.
841+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button.
842+The following page will be presented:
843 </para>
844 <para>
845 <example><title>General Information</title>
846@@ -700,7 +739,7 @@
847 information similar to the example under the text box. Select
848 <guilabel>Linux</guilabel> in the <guilabel>Operating System</guilabel>
849 drop-down menu. When completed, <mousebutton>Click</mousebutton> the
850-<guibutton>Continue</guibutton> button. The following page will be presented.
851+<guibutton>Continue</guibutton> button. The following page will be presented:
852 </para>
853 <para>
854 <example><title>Check for Duplicate Bug Reports</title>
855@@ -714,12 +753,12 @@
856 </step>
857 <step>
858 <para>
859-If a duplicate report is found, click on that report ID to view the report. If
860-it is a duplicate and more information is needed, then simply enter text in the
861-large text box confirming it. If more information is not needed, nothing need
862-be entered. If no duplicate reports are found, <mousebutton>Click</mousebutton>
863-the <guibutton>Continue</guibutton> button. The following page will be
864-presented.
865+If a duplicate report is found, click on that report <acronym>ID</acronym> to
866+view the report. If it is a duplicate and more information is needed, then
867+enter text into the large text box confirming it. If more information is not
868+needed, nothing needs to be entered. If no duplicate reports are found,
869+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button.
870+The following page will be presented:
871 </para>
872 <para>
873 <example><title>Bug Entry Form</title>
874@@ -734,11 +773,11 @@
875 <step>
876 <para>
877 The <guilabel>Severity</guilabel> (required) drop-down menu should display the
878-<guilabel>Bug - Bug report (no crashes)</guilabel> option. In the <guilabel>Long
879-Description in English</guilabel> (required) text box, enter all information
880-pertaining to the bug report. When completed, <mousebutton>Click</mousebutton>
881-the <guibutton>Continue</guibutton> button. The following page will be
882-presented.
883+<guilabel>Bug - Bug report (no crashes)</guilabel> option. In the
884+<guilabel>Long Description in English</guilabel> (required) text box, enter all
885+information pertaining to the bug report. When completed,
886+<mousebutton>Click</mousebutton> the <guibutton>Continue</guibutton> button.
887+The following page will be presented:
888 </para>
889 <para>
890 <example><title>Bug Submitted</title>
891@@ -752,27 +791,30 @@
892 </step>
893 </procedure>
894 <para>
895-<emphasis role="bold">Congratulations on making a successful non-crash related
896-bug report!</emphasis> Identifying and reporting bugs are essential to improving
897-&kubuntu; and KDE. Some emails may be sent to the registered address to update
898-progress or to allow developers to get additional information about the bug.
899+<emphasis>Congratulations on making a successful non-crash-related bug
900+report!</emphasis> Identifying and reporting bugs are essential to improving
901+&kubuntu; and <trademark>KDE</trademark>. Some emails may be sent to the
902+registered address to update progress or to allow developers to get additional
903+information about the bug.
904 </para>
905 </sect2>
906 <sect2 id="filing-non-crash-lp">
907 <title>Launchpad</title>
908 <para>
909-Filing non-crash related bug reports in non-KDE applications can be done either
910-by going to <ulink url="https://bugs.launchpad.net/ubuntu/+filebug"/> in a web
911-browser or by using the <application>Apport</application> bug reporting
912-application. The following procedure will demonstrate the use of
913-<application>Apport</application> as this is the recommended way of filing
914-Ubuntu or non-KDE related bug reports.
915+Filing non-crash-related bug reports in non-<trademark>KDE</trademark>
916+applications can be done either by going to <ulink
917+url="https://bugs.launchpad.net/ubuntu/+filebug"/> in a web browser or by using
918+the <application>Apport</application> bug reporting application. The following
919+procedure will demonstrate the use of <application>Apport</application> as this
920+is the recommended way of filing &ubuntu; or
921+non-<trademark>KDE</trademark>-related bug reports:
922 </para>
923 <procedure><title>Filing a bug report without a crash</title>
924 <step>
925 <para>
926-Open <application>KRunner</application>, the KDE run command interface, by
927-pressing <keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>.
928+Open <application>KRunner</application>, the <trademark>KDE</trademark> run
929+command interface, by pressing
930+<keycombo><keycap>Alt</keycap><keycap>F2</keycap></keycombo>.
931 </para>
932 <para>
933 <example><title>KRunner</title>
934@@ -786,10 +828,11 @@
935 </step>
936 <step>
937 <para>
938-In the <application>KRunner</application> dialog, enter <userinput>apport-bug -p
939-PROGRAM_NAME</userinput>. Replace <emphasis>PROGRAM_NAME</emphasis> with the
940-name of the program the bug report is for. Press <keycap>Enter</keycap> when
941-complete. The following dialog will be presented.
942+In the <application>KRunner</application> dialog, enter
943+<userinput>apport-bug -p PROGRAM_NAME</userinput>. Replace
944+<emphasis>PROGRAM_NAME</emphasis> with the name of the program the bug report
945+is for. Press <keycap>Enter</keycap> when complete. The following dialog will
946+be presented:
947 </para>
948 <para>
949 <example><title>Collecting Problem Information</title>
950@@ -818,9 +861,9 @@
951 </step>
952 <step>
953 <para>
954-<mousebutton>Click</mousebutton> the <guibutton>Details...</guibutton> button to
955-see details of the report to be followed. The following dialog will be
956-presented.
957+<mousebutton>Click</mousebutton> the <guibutton>Details...</guibutton> button
958+to see details of the report to be followed. The following dialog will be
959+presented:
960 </para>
961 <para>
962 <example><title>Report Details</title>
963@@ -835,7 +878,7 @@
964 <step>
965 <para>
966 <mousebutton>Click</mousebutton> the <guibutton>Send</guibutton> button to send
967-the report to the developers. The following progress dialog will be presented.
968+the report to the developers. The following progress dialog will be presented:
969 </para>
970 <para>
971 <example><title>Uploading Problem Information</title>
972@@ -850,7 +893,7 @@
973 <step>
974 <para>
975 After the information has been uploaded, the web browser will open and display
976-a page similar to the following.
977+a page similar to the following:
978 </para>
979 <para>
980 <example><title>Please wait while bug data is processed.</title>
981@@ -862,7 +905,7 @@
982 </example>
983 </para>
984 <para>
985-After the bug data is processed, the following page will be presented.
986+After the bug data is processed, the following page will be presented:
987 </para>
988 <para>
989 <example><title>Report a bug... (Summary)</title>
990@@ -876,9 +919,9 @@
991 </step>
992 <step>
993 <para>
994-Enter text in the <guilabel>Summary</guilabel> text box that describes the bug
995-with a few words. When finished, <mousebutton>Click</mousebutton> the
996-<guibutton>Next</guibutton> button. The following page will be presented.
997+Enter text that describes the bug into the <guilabel>Summary</guilabel> text
998+box. When finished, <mousebutton>Click</mousebutton> the
999+<guibutton>Next</guibutton> button. The following page will be presented:
1000 </para>
1001 <para>
1002 <example><title>Report a bug... (Further information)</title>
1003@@ -895,7 +938,7 @@
1004 Enter text in the <guilabel>Further information</guilabel> text box describing
1005 the bug in detail. When complete, <mousebutton>Click</mousebutton> the
1006 <guibutton>Submit Bug Report</guibutton> button. The following page will be
1007-presented.
1008+presented:
1009 </para>
1010 <para>
1011 <example><title>Thank you for your bug report</title>
1012@@ -909,8 +952,8 @@
1013 </step>
1014 </procedure>
1015 <para>
1016-<emphasis role="bold">Congratulations on making a successful non-crash related
1017-bug report!</emphasis> Identifying and reporting bugs are essential to improving
1018+<emphasis>Congratulations on making a successful non-crash related bug
1019+report!</emphasis> Identifying and reporting bugs are essential to improving
1020 &kubuntu;. Some emails may be sent to the registered address to update progress
1021 or to allow developers to get additional information about the bug.
1022 </para>
1023@@ -920,21 +963,24 @@
1024 <sect1 id="filing-wishlist">
1025 <title>Filing a Feature Request or Wishlist Report</title>
1026 <para>
1027-The easiest way to request a new feature in either an application or the
1028-operating system is to file a bug, otherwise known as a wishlist report.
1029+The easiest way to request a new feature, in either an application or the
1030+operating system, is to file a bug &mdash; otherwise known as a wishlist
1031+report.
1032 </para>
1033 <sect2 id="filing-wishlist-kde">
1034 <title>KDE</title>
1035 <para>
1036-Filing a feature request report in KDE is exactly the same as filing a <link
1037-linkend="filing-non-crash-kde">non-crash KDE bug report</link>.
1038+Filing a feature request report in <trademark>KDE</trademark> is exactly the
1039+same as filing a <link linkend="filing-non-crash-kde">non-crash
1040+<trademark>KDE</trademark> bug report</link>.
1041 </para>
1042 </sect2>
1043 <sect2 id="filing-wishlist-lp">
1044 <title>Launchpad</title>
1045 <para>
1046 Filing a wishlist report for &kubuntu; is exactly the same as filing a <link
1047-linkend="filing-non-crash-lp">non-crash Launchpad bug report</link>.
1048+linkend="filing-non-crash-lp">non-crash <trademark>Launchpad</trademark> bug
1049+report</link>.
1050 </para>
1051 </sect2>
1052 </sect1>
1053
1054=== modified file 'docs/cli/C/cli.xml'
1055--- docs/cli/C/cli.xml 2011-09-04 21:26:14 +0000
1056+++ docs/cli/C/cli.xml 2012-03-22 09:34:17 +0000
1057@@ -13,9 +13,9 @@
1058 &legalnotice;
1059 <abstract>
1060 <para>
1061-This document provides a brief description of the Linux command line. It is not
1062-a complete guide to the command line, but rather an introduction to complement
1063-&kubuntu;&apos;s graphical tools.
1064+This document provides a brief description of the <trademark>Linux</trademark>
1065+command line. It is not a complete guide, but rather an introduction to
1066+complement &kubuntu;'s graphical tools.
1067 </para>
1068 </abstract>
1069 </articleinfo>
1070@@ -25,37 +25,41 @@
1071
1072 <para>
1073 <emphasis>
1074-"Under Linux there are GUIs (graphical user interfaces), where you can point and
1075-click and drag, and hopefully get work done without first reading lots of
1076-documentation. The traditional Unix environment is a CLI (command line
1077-interface), where you type commands to tell the computer what to do. That is
1078-faster and more powerful, but requires finding out what the commands are." --
1079-from <emphasis role="strong">man intro(1)</emphasis>
1080+"Under <trademark>Linux</trademark> there are <acronym>GUI</acronym>s
1081+(graphical user interfaces), where you can point and click and drag and
1082+hopefully get work done without first reading lots of documentation. The
1083+traditional <trademark>Unix</trademark> environment is a
1084+<acronym>CLI</acronym> (command line interface), where you type commands to
1085+tell the computer what to do. That is faster and more powerful, but requires
1086+finding out what the commands are." -- from <emphasis>man intro(1)</emphasis>
1087 </emphasis>
1088 </para>
1089 <para>
1090-This guide describes some basic GNU/Linux shell commands. It is not intended to
1091-be a complete guide to the command line, just an introduction to complement
1092-&kubuntu;&apos;s graphical tools.
1093+This guide describes some basic <trademark>GNU</trademark>/
1094+<trademark>Linux</trademark> shell commands. It is not intended to be a
1095+complete guide to the command line, just an introduction to complement
1096+&kubuntu;'s graphical tools.
1097 </para>
1098 <para>
1099 <itemizedlist>
1100 <listitem>
1101 <para>
1102-All command names, file names or paths to directories will be shown using a <command>monospace font</command>.
1103+All command names, file names, or paths to directories will be shown using a
1104+<command>monospace font</command>.
1105 </para>
1106 </listitem>
1107 <listitem>
1108 <para>
1109-The commands should be issued from a command prompt within a
1110+The commands should be issued from a command prompt within a
1111 <application>Terminal</application> and will be shown as:
1112 <screen>command to type</screen>
1113 </para>
1114 </listitem>
1115 <listitem>
1116 <para>
1117-<emphasis role="strong">Command Line Linux is case sensitive.</emphasis> User,
1118-user, and USER are each different and distinct in Linux.
1119+<emphasis>Command Line <trademark>Linux</trademark> is case
1120+sensitive.</emphasis> User, user, and USER are each different and distinct in
1121+<trademark>Linux</trademark>.
1122 </para>
1123 </listitem>
1124 </itemizedlist>
1125@@ -65,12 +69,12 @@
1126 <sect1 id="terminal">
1127 <title>Starting A Terminal</title>
1128 <para>
1129-&kubuntu;&apos;s Terminal application is called
1130-<application>Konsole</application>, and is opened by going to &menukonsole;.
1131+&kubuntu;'s Terminal application is called <application>Konsole</application>,
1132+and is opened by going to &menukonsole;.
1133 </para>
1134 <para>
1135 <example>
1136-<title>&kubuntu;&apos;s terminal - Konsole</title>
1137+<title>&kubuntu;'s terminal - Konsole</title>
1138 <mediaobject>
1139 <imageobject>
1140 <imagedata fileref="help:/images/C/C/konsole.png" format="PNG"/>
1141@@ -86,12 +90,10 @@
1142 <sect2 id="pwd">
1143 <title>pwd - print working directory</title>
1144 <para>
1145-The <command>pwd</command> command displays the directory where the user is
1146-currently
1147-located. (<acronym>pwd</acronym> stands for <quote>print working
1148-directory</quote>). For example, typing
1149-<screen>pwd</screen> while in the <filename
1150-class="directory">Desktop</filename> will show
1151+The <command>pwd</command> command displays the directory where the user is
1152+currently located. (<acronym>pwd</acronym> stands for <quote>print working
1153+directory</quote>). For example, typing <screen>pwd</screen> while in the
1154+<filename class="directory">Desktop</filename> directory will show
1155 <computeroutput>/home/[username]/Desktop</computeroutput>.
1156 <note>
1157 <para>
1158@@ -105,9 +107,9 @@
1159 <title>cd - change directory</title>
1160 <para>
1161 The <command>cd</command> command changes directories. (<acronym>cd</acronym>
1162-stands for
1163-<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
1164-use of the <command>cd</command>.
1165+stands for <quote>change directory</quote>). When a terminal window is opened,
1166+it will be in the user's home directory. Moving around the file system requires
1167+the use of the <command>cd</command> command.
1168 </para>
1169 <itemizedlist>
1170 <listitem>
1171@@ -125,8 +127,8 @@
1172 </para>
1173 <note>
1174 <para>
1175-The <command>~</command> character represents the current user's home directory.
1176-As shown above, <command>cd ~</command> is equivalent to <command>cd
1177+The <command>~</command> character represents the current user's home
1178+directory. As shown above, <command>cd ~</command> is equivalent to <command>cd
1179 /home/username/</command>. However, when running a command as root (using
1180 <command>sudo</command>, for example), <command>~</command> points to <filename
1181 class="directory">/root</filename>. When running a <command>cd</command> command
1182@@ -161,8 +163,8 @@
1183 of <filename class="directory">/var/</filename>. For another example, typing:
1184 <screen>cd ~/Desktop</screen>
1185 moves to the <filename
1186-class="directory">Desktop</filename> subdirectory inside the current user's home
1187-directory.
1188+class="directory">Desktop</filename> subdirectory inside the current user's
1189+home directory.
1190 </para>
1191 </listitem>
1192 </itemizedlist>
1193@@ -171,11 +173,9 @@
1194 <title>ls - list files</title>
1195 <para>
1196 The <command>ls</command> command outputs a list of the files in the current
1197-directory. (<acronym>ls</acronym> is short for <quote>list</quote>). For example,
1198-typing
1199-<screen>ls ~</screen>
1200-will display the files that are in the current
1201-user's home directory.
1202+directory. (<acronym>ls</acronym> is short for <quote>list</quote>). For
1203+example, typing <screen>ls ~</screen> will display the files that are in the
1204+current user's home directory.
1205 </para>
1206 <para>
1207 Used with the <command>-l</command> option, <command>ls</command> outputs other
1208@@ -185,34 +185,34 @@
1209 <para>
1210 Used with the <command>-al</command> options, <command>ls</command> outputs
1211 the information associated with the <command>-l</command> option in addition to
1212-showing hidden files (<command>a</command>
1213-option).
1214+showing hidden files (<command>a</command> option).
1215 </para>
1216 </sect2>
1217 <sect2 id="touch">
1218 <title>touch - create empty file</title>
1219 <para>
1220-The <command>touch</command> command is used either to change a file's access
1221-and modification timestamps or to create a new empty file. For example,
1222-<screen>touch foo</screen>
1223-will create a new empty file named <filename>foo</filename>. If
1224-<filename>foo</filename> is already a file, then using <command>touch</command>
1225-will update the timestamps on the file which will show
1226-the last time a file was <emphasis>touched</emphasis>.
1227+The <command>touch</command> command is used to change a file's access and
1228+modification timestamps or to create a new empty file. For example,
1229+<screen>touch foo</screen> will create a new empty file named
1230+<filename>foo</filename>. If <filename>foo</filename> is already a file, then
1231+using <command>touch</command> will update the timestamps on the file, which
1232+show the last time a file was <emphasis>touched</emphasis>.
1233 </para>
1234 </sect2>
1235 <sect2 id="mkdir">
1236 <title>mkdir - make directory</title>
1237 <para>
1238-The <command>mkdir</command> command is used to create a new directory. (<acronym>mkdir</acronym> stands for <quote>make directory</quote>). To create a
1239-new directory named <filename class="directory">foobar</filename>, type:
1240+The <command>mkdir</command> command is used to create a new directory.
1241+(<acronym>mkdir</acronym> stands for <quote>make directory</quote>). To create
1242+a new directory named <filename class="directory">foobar</filename>, type:
1243 <screen>mkdir foobar</screen>
1244 </para>
1245 </sect2>
1246 <sect2 id="cp">
1247 <title>cp - copy files or directories</title>
1248 <para>
1249-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
1250+The <command>cp</command> command makes a copy of a file or directory.
1251+(<acronym>cp</acronym> is short for <quote>copy</quote>). To make an exact copy
1252 of <filename>foo</filename> and name it <filename>bar</filename>, type:
1253 <screen>cp foo bar</screen>
1254 To make an exact copy of the <filename class="directory">foo_dir</filename>
1255@@ -224,34 +224,32 @@
1256 <title>mv - move files or directories</title>
1257 <para>
1258 The <command>mv</command> command moves a file or directory to a different
1259-location or will rename a file or directory. (<acronym>mv</acronym> is short for
1260+location or renames a file or directory. (<acronym>mv</acronym> is short for
1261 <quote>move</quote>). To rename the file <filename>foo</filename> to
1262-<filename>bar</filename>, type:
1263-<screen>mv foo bar</screen>
1264-To move the file <filename>foo</filename> into the current user's <filename
1265-class="directory">Desktop</filename> directory, type:
1266-<screen>mv foo ~/Desktop</screen>
1267-This will not rename <filename>foo</filename> to <filename>Desktop</filename>
1268-because <filename>foo</filename> is a file and <filename
1269-class="directory">Desktop</filename> is a directory.
1270+<filename>bar</filename>, type: <screen>mv foo bar</screen> To move the file
1271+<filename>foo</filename> into the current user's <filename
1272+class="directory">Desktop</filename> directory, type: <screen>mv foo
1273+~/Desktop</screen> This will not rename <filename>foo</filename> to
1274+<filename>Desktop</filename>, because <filename>foo</filename> is a file and
1275+<filename class="directory">Desktop</filename> is a directory.
1276 </para>
1277 </sect2>
1278 <sect2 id="rm">
1279 <title>rm - remove files or directories</title>
1280 <para>
1281-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
1282-<filename>foo</filename> for the current directory, type:
1283+The <command>rm</command> command is used to delete files and directories.
1284+(<acronym>rm</acronym> is short for <quote>remove</quote>). To delete the file
1285+<filename>foo</filename> from the current directory, type:
1286 <screen>rm foo</screen>
1287 </para>
1288 <para>
1289 By default, <command>rm</command> will not remove directories. To remove a
1290-directory, you must use the <command>-r</command> option (also can be entered
1291-as either <command>-R</command> or <command>--recursive</command>). For example,
1292-<screen>rm -r foobar</screen> or
1293-<screen>rm -R foobar</screen> or
1294-<screen>rm --recursive foobar</screen>
1295-will remove the directory <filename class="directory">foobar</filename>,
1296-<emphasis role="strong"> and all of its contents!</emphasis>
1297+directory, you must use the <command>-r</command> option (which can also be
1298+entered as <command>-R</command> or <command>--recursive</command>). For
1299+example, <screen>rm -r foobar</screen> or <screen>rm -R foobar</screen> or
1300+<screen>rm --recursive foobar</screen> will remove the directory
1301+<filename class="directory">foobar</filename> <emphasis> and all of its
1302+contents!</emphasis>
1303 </para>
1304 </sect2>
1305
1306@@ -265,8 +263,7 @@
1307 <para>
1308 The <command>df</command> command displays filesystem disk space usage for all
1309 partitions. (<acronym>df</acronym> stands for <quote>disk free</quote>).
1310-<screen>df -h</screen>
1311-will give information using megabytes
1312+<screen>df -h</screen> will give information using megabytes
1313 (<abbrev>M</abbrev>) and gigabytes (<abbrev>G</abbrev>) instead of blocks
1314 (<command>-h</command> means <quote>human readable</quote>).
1315 </para>
1316@@ -275,26 +272,24 @@
1317 <title>free - display amount of free and used memory</title>
1318 <para>
1319 The <command>free</command> command displays the amount of free and used memory
1320-in the system.
1321-<screen>free -m</screen>
1322-will give the information using megabytes, which is probably the most useful for
1323-current computers.
1324+in the system. <screen>free -m</screen> will give the information using
1325+megabytes, which is probably the most useful for current computers.
1326 </para>
1327 </sect2>
1328 <sect2 id="top">
1329 <title>top - display top consuming processes</title>
1330 <para>
1331-The <command>top</command> command displays information on the Linux system -
1332-processes that are running, system resources including <acronym>CPU</acronym>,
1333-<acronym>RAM</acronym> &amp; swap usage, and the total number of tasks being
1334-run. To
1335-exit <command>top</command>, press <keycap>q</keycap>.
1336+The <command>top</command> command displays information on the
1337+<trademark>Linux</trademark> system - processes that are running, system
1338+resources including <acronym>CPU</acronym>, <acronym>RAM</acronym> &amp; swap
1339+usage, and the total number of tasks being run. To exit <command>top</command>,
1340+press <keycap>q</keycap>.
1341 </para>
1342 </sect2>
1343 <sect2 id="uname">
1344 <title>uname - print details about the current machine</title>
1345 <para>
1346-The <command>uname</command> command with the <command>-a</command> options
1347+The <command>uname</command> command with the <command>-a</command> option
1348 displays all system information, including machine name, kernel name &amp;
1349 version, and other details. This command is useful for checking which kernel is
1350 in use. (<abbrev>uname</abbrev> is short for <quote>unix name</quote>).
1351@@ -304,8 +299,8 @@
1352 <title>lsb_release - print details about current Linux release</title>
1353 <para>
1354 The <command>lsb_release</command> with the <command>-a</command> option prints
1355-version information for the Linux release in use. For example, typing:
1356-<screen>lsb_release -a</screen> will display:
1357+version information for the <trademark>Linux</trademark> release in use. For
1358+example, typing: <screen>lsb_release -a</screen> will display:
1359 <screen>No LSB modules are available.
1360 Distributor ID: Ubuntu
1361 Description: Ubuntu &distro-rev;
1362@@ -323,49 +318,41 @@
1363 The following commands must be prefaced with the
1364 <command>sudo</command> command. Please see <ulink
1365 url="https://help.ubuntu.com/community/RootSudo">RootSudo</ulink> for
1366-information on using <command>sudo</command>. (<abbrev>sudo</abbrev> is short for
1367-<quote>superuser do</quote>).
1368+information on using <command>sudo</command>. (<abbrev>sudo</abbrev> is short
1369+for <quote>superuser do</quote>).
1370 </para>
1371 <sect2 id="add-group">
1372 <title>Adding a New Group</title>
1373 <para>
1374 The <command>addgroup</command> command is used to create a new group in the
1375-system. To create a new group, type:
1376-<screen>sudo addgroup foobar</screen>
1377-The above command will create a new group called <emphasis
1378-role="strong">foobar</emphasis>.
1379+system. To create a new group, type: <screen>sudo addgroup foobar</screen> The
1380+above command will create a new group called <emphasis>foobar</emphasis>.
1381 </para>
1382 </sect2>
1383 <sect2 id="add-user">
1384 <title>Adding a New User</title>
1385 <para>
1386 The <command>adduser</command> command is used to create a new user on the
1387-system. To create a new user, type:
1388-<screen>adduser foobar</screen>
1389-which will create a new user called <emphasis role="strong">foobar</emphasis>.
1390+system. To create a new user, type: <screen>adduser foobar</screen> which will
1391+create a new user called <emphasis>foobar</emphasis>.
1392 </para>
1393 </sect2>
1394 <sect2 id="passwd">
1395 <title>Add or Change a User Password</title>
1396 <para>
1397 The <command>passwd</command> command is used to assign a new password to a
1398-new user or to change the current password for an existing user. To add a
1399-password or change the password for the user <emphasis
1400-role="strong">foobar</emphasis>,
1401-type:
1402-<screen>passwd foobar</screen>
1403-For new users, this will generate a prompt to enter the new password. For
1404-an
1405-existing user, there will be a prompt for the existing password before the
1406-prompt for a new password.
1407+new user or change the current password for an existing user. To add a password
1408+or change the password for the user <emphasis>foobar</emphasis>, type:
1409+<screen>passwd foobar</screen> For new users, this will generate a prompt to
1410+enter the new password. For an existing user, there will be a prompt for the
1411+existing password before the prompt for a new password.
1412 </para>
1413 </sect2>
1414 <sect2 id="assign-user-group">
1415 <title>Assign User to Group</title>
1416 <para>
1417-To assign the user <emphasis role="strong">foobar</emphasis> to the group
1418-<emphasis role="strong">barfoo</emphasis>, type:
1419-<screen>adduser foobar barfoo</screen>
1420+To assign the user <emphasis>foobar</emphasis> to the group
1421+<emphasis>barfoo</emphasis>, type: <screen>adduser foobar barfoo</screen>
1422 </para>
1423 </sect2>
1424 </sect1>
1425@@ -374,20 +361,20 @@
1426 <sect1 id="options">
1427 <title>Options</title>
1428 <para>
1429-The default behavior for a command may usually be modified by adding <command>--option</command> to the command. For example, the <link
1430-linkend="ls"><command>ls</command></link> command has an
1431-<command>-s</command> option. The <command>ls -s</command> will include file
1432-sizes in the listing. There is also a <command>-h</command> option to display
1433-file sizes in a <quote>human readable</quote> format.
1434+The default behavior for a command may usually be modified by adding
1435+<command>--option</command> to the command. For example, the <link
1436+linkend="ls"><command>ls</command></link> command has an <command>-s</command>
1437+option. The <command>ls -s</command> will include file sizes in the listing.
1438+There is also a <command>-h</command> option to display file sizes in a
1439+<quote>human readable</quote> format.
1440 </para>
1441 <para>
1442 Options can be grouped in clusters, so
1443 <screen>ls -sh</screen>
1444 is the same command as
1445 <screen> ls -s -h</screen>
1446-Most options have a long version, prefixed with two dashes instead of one, so
1447-<screen>ls --size --human-readable</screen>
1448-is also the same command as
1449+Most options have a long version prefixed with two dashes instead of one, so
1450+<screen>ls --size --human-readable</screen> is the same command as
1451 <screen>ls -sh</screen>
1452 </para>
1453 </sect1>
1454@@ -396,14 +383,13 @@
1455 <sect1 id="man-help">
1456 <title><quote>Man</quote> and Getting Help</title>
1457 <para>
1458-<emphasis role="strong"><emphasis>command</emphasis> --help</emphasis> and
1459-<command>man</command> <emphasis
1460-role="strong"><emphasis>command</emphasis></emphasis> are the two most important
1461+<emphasis><emphasis>command</emphasis> --help</emphasis> and
1462+<command>man</command> <emphasis>command</emphasis> are the two most important
1463 tools at the command line.
1464 </para>
1465 <para>
1466 Virtually all commands understand the <command>-h</command> (or
1467-<command>--help</command>) option which will produce a short usage description
1468+<command>--help</command>) option, which will produce a short usage description
1469 of the command and its options, then exit back to the command prompt. Type:
1470 <screen>man -h</screen>
1471 or
1472@@ -411,33 +397,29 @@
1473 to see this in action.
1474 </para>
1475 <para>
1476-Every command and nearly every application in Linux has a
1477-<abbrev>man</abbrev> (manual) file. It is as simple as typing <command>man
1478+Every command and nearly every application in <trademark>Linux</trademark> has
1479+a <abbrev>man</abbrev> (manual) file. It is as simple as typing <command>man
1480 command</command> to bring up a longer manual entry for the specified command.
1481-For example:
1482-<screen>man mv</screen>
1483-brings up the <command>mv</command> manual.
1484+For example: <screen>man mv</screen> brings up the <command>mv</command>
1485+manual.
1486 </para>
1487 <para>
1488 Move up and down the man file with the arrow keys, and quit back to the command
1489 prompt with <keycap>q</keycap>.
1490 </para>
1491 <para>
1492-<screen>man man</screen>
1493-brings up the manual entry for the <command>man</command> command, which is a
1494-good place to start.
1495+<screen>man man</screen> brings up the manual entry for the
1496+<command>man</command> command, which is a good place to start.
1497 </para>
1498 <para>
1499-<screen>man intro</screen>
1500-is especially useful. It displays the <quote>introduction to user
1501-commands</quote> which is a well-written, brief introduction to the Linux
1502-command line.
1503+<screen>man intro</screen> is especially useful. It displays the
1504+<quote>introduction to user commands</quote> which is a well-written, brief
1505+introduction to the <trademark>Linux</trademark> command line.
1506 </para>
1507 <para>
1508 There are also <command>info</command> pages, which generally go into more
1509-detail than <command>man</command> pages. Try:
1510-<screen>info info</screen>
1511-for the introduction to info pages.
1512+detail than <command>man</command> pages. Try: <screen>info info</screen> for
1513+the introduction to info pages.
1514 </para>
1515 <sect2 id="searching-for-man-files">
1516 <title>Searching for man files</title>
1517@@ -473,14 +455,14 @@
1518 There are often situations that require text to be pasted into the terminal.
1519 </para>
1520 <para>
1521-Text copied from a web page using
1522+Text copied from a web page using
1523 <keycombo><keycap>Ctrl</keycap><keycap>C</keycap></keycombo> won't paste with
1524 <keycombo><keycap>Ctrl</keycap><keycap>V</keycap></keycombo> as it does in
1525-other applications because the
1526-terminal uses a different combination for paste,
1527-<keycombo><keycap>Shift</keycap><keycap>Insert</keycap></keycombo>. Pasting can
1528-also be done using the mouse by <mousebutton>right-clicking</mousebutton> in
1529-the terminal and selecting <guimenuitem>Paste</guimenuitem> from the menu.
1530+other applications, because the terminal uses the
1531+<keycombo><keycap>Shift</keycap><keycap>Insert</keycap></keycombo>
1532+combination. Pasting can also be done using the mouse by
1533+<mousebutton>right-clicking</mousebutton> in the terminal and selecting
1534+<guimenuitem>Paste</guimenuitem> from the menu.
1535 </para>
1536 <para>
1537 Text can also be copied by selecting (highlighting) the text to be copied.
1538@@ -490,8 +472,9 @@
1539 </para>
1540 <note>
1541 <para>
1542-These actions may work differently in other terminal emulators than <application>Konsole</application>.
1543-Consult your terminal emulator's documentation for details.
1544+These actions may work differently in other terminal emulators than
1545+<application>Konsole</application>. Consult your terminal emulator's
1546+documentation for details.
1547 </para>
1548 </note>
1549 </sect1>
1550@@ -507,7 +490,7 @@
1551 </term>
1552 <listitem>
1553 <para>
1554-Scrolls backwards through the commands entered previously
1555+Scrolls backwards through the commands entered previously.
1556 </para>
1557 </listitem>
1558 </varlistentry>
1559@@ -518,7 +501,7 @@
1560 </term>
1561 <listitem>
1562 <para>
1563-Scrolls forward through previous commands
1564+Scrolls forward through previous commands.
1565 </para>
1566 </listitem>
1567 </varlistentry>
1568@@ -528,7 +511,7 @@
1569 </term>
1570 <listitem>
1571 <para>
1572-Executes the command selected
1573+Executes the selected command.
1574 </para>
1575 </listitem>
1576 </varlistentry>
1577@@ -539,7 +522,7 @@
1578 <listitem>
1579 <para>
1580 Tab is a useful feature. It autocompletes any commands or filenames if there is
1581-one option, otherwise it displays a list of options that fit the information
1582+one option. Otherwise it displays a list of options that fit the information
1583 entered. Using tab in this way reduces typing errors.
1584 </para>
1585 </listitem>
1586@@ -567,7 +550,7 @@
1587 </term>
1588 <listitem>
1589 <para>
1590-Moves the cursor to the <emphasis>start</emphasis> of the line
1591+Moves the cursor to the <emphasis>start</emphasis> of the line.
1592 </para>
1593 </listitem>
1594 </varlistentry>
1595@@ -578,7 +561,7 @@
1596 </term>
1597 <listitem>
1598 <para>
1599-Moves the cursor to the <emphasis>end</emphasis> of the line
1600+Moves the cursor to the <emphasis>end</emphasis> of the line.
1601 </para>
1602 </listitem>
1603 </varlistentry>
1604@@ -588,7 +571,7 @@
1605 </term>
1606 <listitem>
1607 <para>
1608-Deletes from the current cursor position to the end of the line
1609+Deletes from the current cursor position to the end of the line.
1610 </para>
1611 </listitem>
1612 </varlistentry>
1613@@ -598,7 +581,7 @@
1614 </term>
1615 <listitem>
1616 <para>
1617-Deletes the entire current line
1618+Deletes the entire current line.
1619 </para>
1620 </listitem>
1621 </varlistentry>
1622@@ -608,7 +591,7 @@
1623 </term>
1624 <listitem>
1625 <para>
1626-Deletes the word before the cursor
1627+Deletes the word before the cursor.
1628 </para>
1629 </listitem>
1630 </varlistentry>
1631@@ -624,8 +607,8 @@
1632 <itemizedlist>
1633 <listitem>
1634 <para>
1635-<ulink url="https://help.ubuntu.com/community/AptGetHowto">AptGetHowto</ulink> -
1636-using <command>apt-get</command> to install packages from the command line.
1637+<ulink url="https://help.ubuntu.com/community/AptGetHowto">AptGetHowto</ulink>
1638+- using <command>apt-get</command> to install packages from the command line.
1639 </para>
1640 </listitem>
1641 <listitem>
1642@@ -653,25 +636,26 @@
1643 <para>
1644 <ulink url="https://help.ubuntu.com/community/CommandlineHowto">Commandline
1645 Howto</ulink> - longer and more complete than this basic guide; still not
1646-finished however.
1647+finished, however.
1648 </para>
1649 </listitem>
1650 <listitem>
1651 <para>
1652 <ulink url="https://help.ubuntu.com/community/HowToReadline">Howto
1653-Readline</ulink> - information on more advanced customization for the
1654-command line.
1655+Readline</ulink> - information on more advanced customization for the command
1656+line.
1657 </para>
1658 </listitem>
1659 </itemizedlist>
1660 <para>
1661-For more detailed tutorials on the Linux command line, please see:
1662+For more detailed tutorials on the <trademark>Linux</trademark> command line,
1663+please see:
1664 </para>
1665 <itemizedlist>
1666 <listitem>
1667 <para>
1668-<ulink url="http://ss64.com/bash/"/> - an A-Z index of the Bash command line for
1669-Linux.
1670+<ulink url="http://ss64.com/bash/"/> - an A-Z index of the
1671+<trademark>Bash</trademark> command line for <trademark>Linux</trademark>.
1672 </para>
1673 </listitem>
1674 <listitem>
1675@@ -682,19 +666,20 @@
1676 </listitem>
1677 <listitem>
1678 <para>
1679-<ulink url="http://linuxsurvival.com/index.php" /> - Java-based tutorials.
1680+<ulink url="http://linuxsurvival.com/index.php" /> -
1681+<trademark>Java</trademark>-based tutorials.
1682 </para>
1683 </listitem>
1684 <listitem>
1685 <para>
1686 <ulink url="http://rute.2038bug.com/index.html.gz"/> - a massive online book
1687-about system administration, almost all from the command line.
1688+about system administration &mdash; almost all from the command line.
1689 </para>
1690 </listitem>
1691 <listitem>
1692 <para>
1693-<ulink url="http://www.commandlinefu.com/"/> - a place to record command-line
1694-favorites and view other's gems as well.
1695+<ulink url="http://www.commandlinefu.com/"/> - a place to record command line
1696+favorites and view others' gems as well.
1697 </para>
1698 </listitem>
1699 </itemizedlist>
1700
1701=== modified file 'docs/security/C/security.xml'
1702--- docs/security/C/security.xml 2010-03-26 21:38:03 +0000
1703+++ docs/security/C/security.xml 2012-03-22 09:34:17 +0000
1704@@ -70,24 +70,25 @@
1705 Keyboard shortcuts can be changed in <application>System Settings</application>
1706 under the <guilabel>Keyboard &amp; Mouse</guilabel>. To access these settings,
1707 go to Menu Bread Crumbs. Select <guilabel>Global Keyboard Shortcuts</guilabel>,
1708-in the KDE component dropdown, select <guilabel>Run Command Interface</guilabel>
1709-and locate <guilabel>Lock Session</guilabel>.
1710+in the <trademark>KDE</trademark> component drop-down, select <guilabel>Run
1711+Command Interface</guilabel>, and locate <guilabel>Lock Session</guilabel>.
1712 </para>
1713 </note>
1714
1715 <note><title>Adding a lock screen button to the panel</title>
1716 <para>
1717 A <guibutton>Lock Screen</guibutton> button can be added to the
1718-<application>Panel</application> for quick and easy screen locking. Right-click
1719-the <application>Panel</application>, select <guibutton>Add
1720-Widgets...</guibutton>, select <guibutton>Lock/Logout</guibutton> and drag it
1721-to the proper location on the Panel.
1722+<application>Panel</application> for quick and easy screen locking.
1723+<mousebutton>Right-click</mousebutton> the <application>Panel</application>,
1724+select <guibutton>Add Widgets...</guibutton>, select
1725+<guibutton>Lock/Logout</guibutton>, and drag it to the proper location on the
1726+<application>Panel</application>.
1727 </para>
1728 </note>
1729
1730 <para>
1731 To unlock the screen, move the mouse or press a key. Enter the password, and
1732-either press the <keycap>Return</keycap> key or press the
1733+either press the <keycap>Return</keycap> key or press the
1734 <guibutton>Unlock</guibutton> button.
1735 </para>
1736 <para>
1737@@ -105,17 +106,17 @@
1738
1739 <para>
1740 <application>Guarddog</application> is the firewall of choice for &kubuntu;.
1741-Please review the <ulink type="help"
1742-url="help:/kubuntu/network/">Networking</ulink>
1743-documentation and locate the <application>Guarddog</application> section.
1744+Please review the <ulink type="help"
1745+url="help:/kubuntu/network/">Networking</ulink> documentation and locate the
1746+<application>Guarddog</application> section.
1747 </para>
1748 </sect1>
1749
1750 <sect1 id="keep-safe-avoid-internet-crime" status="complete">
1751 <title>Avoid Internet nuisances and crime</title>
1752
1753-<para>From time to time, email messages carry viruses or links to fraudulent
1754-websites. It is important to learn how to deal with these messages, in order to
1755+<para>From time to time email messages carry viruses or links to fraudulent
1756+web sites. It is important to learn how to deal with these messages in order to
1757 prevent the computer or personal information from being compromised or misused.
1758 </para>
1759
1760@@ -131,20 +132,20 @@
1761 <itemizedlist>
1762 <listitem>
1763 <para>
1764-Spam (junk) email with offers for unwanted services and products
1765-</para>
1766-</listitem>
1767-
1768-<listitem>
1769-<para>
1770-Scam emails asking for help in exchange for money
1771-</para>
1772-</listitem>
1773-
1774-<listitem>
1775-<para>
1776-Phishing email that appears to be from a bank or other online service, asking
1777-for personal and financial details, or passwords
1778+Spam (junk) email with offers for unwanted services and products.
1779+</para>
1780+</listitem>
1781+
1782+<listitem>
1783+<para>
1784+Scam emails asking for help in exchange for money.
1785+</para>
1786+</listitem>
1787+
1788+<listitem>
1789+<para>
1790+Phishing email, that appears to be from a bank or other online service, asking
1791+for personal and financial details or passwords.
1792 </para>
1793 </listitem>
1794 </itemizedlist>
1795@@ -159,7 +160,7 @@
1796
1797 <listitem>
1798 <para>
1799-Never click on links in emails that lead to websites asking for passwords or
1800+Never click on links in emails that lead to web sites asking for passwords or
1801 similar information. It is possible for the text of the link to show one
1802 address, but clicking on the link actually connects to a different (possibly
1803 dangerous) address. Instead of clicking a potentially misleading link, type the
1804@@ -169,22 +170,22 @@
1805
1806 <listitem>
1807 <para>
1808-When visiting a website that asks for financial information, ensure that it is
1809-secure. <application>Konqueror</application> and
1810+When visiting a web site that asks for financial information, ensure that it is
1811+secure. <application>Konqueror</application> and
1812 <application>Firefox</application> are two browsers commonly used in &kubuntu;.
1813-Both have two areas that indicate if the current page is secure. On secure
1814-webpages, the address bar will have a yellow background and a lock
1815-symbol to the right of the address. The second area is the status bar located at
1816-the bottom right of the browser window. If the page is secure, a lock icon will
1817-appear in this area. Clicking on either of the lock symbols will produce a
1818-dialog that explains the type of licensing and security for that page.
1819+Both have two areas that indicate if the current page is secure. On secure web
1820+pages, the address bar will have a yellow background and a lock symbol to the
1821+right of the address. The second area is the status bar located at the bottom
1822+right of the browser window. If the page is secure, a lock icon will appear in
1823+this area. Clicking on either of the lock symbols will produce a dialog that
1824+explains the type of licensing and security for the page.
1825 </para>
1826 </listitem>
1827
1828 <listitem>
1829 <para>
1830 Only download and run software from trusted sources. By default, software can
1831-only be downloaded directly from Ubuntu.
1832+only be downloaded directly from &ubuntu;.
1833 </para>
1834 </listitem>
1835 </itemizedlist>
1836@@ -196,8 +197,8 @@
1837 <para>
1838 Occasionally users lose computer information. There are many possible causes
1839 for such unforeseen <emphasis>data loss</emphasis>. The problem could be
1840-anything from a power loss or equipment failure to accidentally deleting a file.
1841-With regular backup copies, if a problem should occur, it may be possible
1842+anything from a power loss or equipment failure to accidentally deleting a
1843+file. With regular backup copies, if a problem should occur, it may be possible
1844 to retrieve important files. Users are strongly encouraged to make backups.
1845 </para>
1846 <para>
1847@@ -206,9 +207,11 @@
1848 attached to the computer. Options include:
1849 </para>
1850 <itemizedlist>
1851-<listitem><para>Writable CDs and DVDs</para></listitem>
1852-<listitem><para>External hard disks and flash memory devices</para></listitem>
1853-<listitem><para>Another computer on the network</para></listitem>
1854+<listitem><para>Writable <acronym>CD</acronym>s and <acronym>DVD</acronym>s.
1855+</para></listitem>
1856+<listitem><para>External hard disks.</para></listitem>
1857+<listitem><para>Flash memory devices.</para></listitem>
1858+<listitem><para>Another computer on the network.</para></listitem>
1859 </itemizedlist>
1860 <para>
1861 A simple way of backing up your files is to copy them manually to a safe
1862@@ -217,7 +220,7 @@
1863 </para>
1864 <para>
1865 Another backup method is <application>Keep</application>, an automated &kubuntu;
1866-backup solution, preferred by many &kubuntu; veterans. To install the
1867+backup solution preferred by many &kubuntu; veterans. To install the
1868 <application>Keep</application> package, please refer to the <ulink
1869 type="help" url="help:/kubuntu/manage-software/">Adding Applications</ulink>
1870 document for help on installing applications. Once installed,
1871
1872=== modified file 'docs/sharing/C/sharing.xml'
1873--- docs/sharing/C/sharing.xml 2010-03-26 21:38:03 +0000
1874+++ docs/sharing/C/sharing.xml 2012-03-22 09:34:17 +0000
1875@@ -13,7 +13,8 @@
1876 &legalnotice;
1877 <abstract>
1878 <para>
1879-This document explains how to share files between &kubuntu; and Windows.
1880+This document explains how to share files between &kubuntu; and
1881+<trademark class='registered'>Windows</trademark>.
1882 </para>
1883 </abstract>
1884 </articleinfo>
1885@@ -25,17 +26,20 @@
1886 Computer networks are often comprised of diverse systems. While operating a
1887 network made up entirely of &kubuntu; desktop and server computers would
1888 certainly be fun, some network environments will consist of &kubuntu; and
1889-<trademark class='registered'>Microsoft</trademark>
1890-<trademark class='registered'>Windows</trademark> systems working together. This
1891-section of the &kubuntu; &sg-title; introduces principles and tools used for
1892-configuring &kubuntu; servers to share network resources with Windows computers.
1893+<trademark class='registered'>Microsoft</trademark> <trademark
1894+class='registered'>Windows</trademark> systems working together. This section
1895+of the &kubuntu; &sg-title; introduces principles and tools used for
1896+configuring &kubuntu; servers to share network resources with <trademark
1897+class='registered'>Windows</trademark> computers.
1898 </para>
1899
1900 <para>
1901-Successfully networking a &kubuntu; system with Windows clients involves
1902-providing and integrating services common to Windows environments. These
1903-services support sharing data and information about the computers and users
1904-on the network, and may be classified into three major categories:
1905+Successfully networking a &kubuntu; system with <trademark
1906+class='registered'>Windows</trademark> clients involves providing and
1907+integrating services common to <trademark
1908+class='registered'>Windows</trademark> environments. These services support
1909+sharing data and information about the computers and users on the network, and
1910+may be classified into three major categories:
1911 </para>
1912
1913 <itemizedlist>
1914@@ -48,35 +52,39 @@
1915 </listitem>
1916 <listitem>
1917 <para>
1918-<emphasis role="bold">Directory Services</emphasis>. Vital information is shared
1919-about the computers and users of the network with such technologies as the
1920-Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and Microsoft
1921-<trademark class='registered'>Active Directory</trademark>.
1922+<emphasis>Directory Services</emphasis>. Vital information is
1923+shared about the computers and users of the network with such technologies as
1924+the Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and
1925+<trademark class='registered'>Microsoft</trademark> <trademark
1926+class='registered'>Active Directory</trademark>.
1927 </para>
1928 </listitem>
1929 <listitem>
1930 <para>
1931-<emphasis role="bold">Authentication and Access</emphasis>. It is
1932-necessary to be able to establish the identity of a computer or user to
1933-determine the information the computer or user is authorized to access.
1934-Authentication and access use principles and technologies such as file
1935-permissions, group policies, and the Kerberos authentication service.
1936+<emphasis>Authentication and Access</emphasis>. It is necessary to be able to
1937+establish the identity of a computer or user to determine the information the
1938+computer or user is authorized to access. Authentication and access use
1939+principles and technologies such as file permissions, group policies, and the
1940+<trademark>Kerberos</trademark> authentication service.
1941 </para>
1942 </listitem>
1943 </itemizedlist>
1944
1945 <para>
1946-A &kubuntu; system can provide all such capabilities for Windows clients and
1947-enable sharing network resources with them. One of the principal pieces of
1948-software included in a &kubuntu; system for Windows networking is the Samba
1949-suite of <acronym>SMB</acronym> server applications and tools.
1950+A &kubuntu; system can provide all such capabilities for <trademark
1951+class='registered'>Windows</trademark> clients and enable sharing network
1952+resources with them. One of the principal pieces of software included in a
1953+&kubuntu; system for <trademark class='registered'>Windows</trademark>
1954+networking is the <application>Samba</application> suite of
1955+<acronym>SMB</acronym> server applications and tools.
1956 </para>
1957
1958 <para>
1959-This section of the &kubuntu; &sg-title; will introduce some of the ways Samba
1960-is commonly used, and how to install and configure the necessary packages.
1961-Additional detailed documentation and information on Samba can be found
1962-on the <ulink url="http://www.samba.org">Samba website</ulink>.
1963+This section of the &kubuntu; &sg-title; will introduce some of the ways
1964+<application>Samba</application> is commonly used, and how to install and
1965+configure the necessary packages. Additional detailed documentation and
1966+information on <application>Samba</application> can be found on the <ulink
1967+url="http://www.samba.org"><application>Samba</application> website</ulink>.
1968 </para>
1969 </sect1>
1970
1971@@ -84,22 +92,25 @@
1972 <title>Samba File Server</title>
1973
1974 <para>
1975-One of the most common ways to network &kubuntu; and Windows computers is to
1976-configure Samba as a File Server. This section covers setting up a
1977-<application>Samba</application> server to share files with Windows clients.
1978+One of the most common ways to network &kubuntu; and <trademark
1979+class='registered'>Windows</trademark> computers is to configure
1980+<application>Samba</application> as a file server. This section covers setting
1981+up a <application>Samba</application> server to share files with <trademark
1982+class='registered'>Windows</trademark> clients.
1983 </para>
1984
1985 <para>
1986 The server will be configured to share files with any client on the network
1987-without prompting for a password. If the environment requires stricter Access
1988-Controls, see <xref linkend="samba-fileprint-security"/>
1989+without prompting for a password. If the environment requires stricter access
1990+controls, see <xref linkend="samba-fileprint-security"/>.
1991 </para>
1992
1993 <sect2 id="samba-fileserver-installation">
1994 <title>Installation</title>
1995
1996 <para>
1997-The first step is to install the <application>samba</application> package. From a terminal prompt enter:
1998+The first step is to install the <application>samba</application> package. From
1999+a terminal prompt, enter:
2000 </para>
2001
2002 <screen>
2003@@ -107,7 +118,8 @@
2004 </screen>
2005
2006 <para>
2007-That's all there is to it. Samba is ready to be configured for file sharing.
2008+That's all there is to it. <application>Samba</application> is ready to be
2009+configured for file sharing.
2010 </para>
2011
2012 </sect2>
2013@@ -115,16 +127,18 @@
2014 <title>Configuration</title>
2015
2016 <para>
2017-The main Samba configuration file is located in
2018-<filename>/etc/samba/smb.conf</filename>. The default configuration file has a
2019+The main <application>Samba</application> configuration file is located in
2020+<filename>/etc/samba/smb.conf</filename>. The default configuration file has a
2021 significant number of comments in order to document various configuration
2022-directives.
2023+directives.
2024 </para>
2025 <note>
2026 <para>
2027-Not all the available options are included in the default configuration file. See the <filename>smb.conf</filename>
2028-<application>man</application> page or the
2029-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink> for more details.
2030+Not all of the available options are included in the default configuration
2031+file. See the <filename>smb.conf</filename> <application>man</application> page
2032+or the <ulink
2033+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
2034+<application>Samba</application> HOWTO Collection</ulink> for more details.
2035 </para>
2036 </note>
2037
2038@@ -144,8 +158,8 @@
2039
2040 <para>
2041 The <emphasis>security</emphasis> parameter is farther down in the [global]
2042-section, and is commented out by default.
2043-Change <emphasis>EXAMPLE</emphasis> to match the actual environment.
2044+section, and is commented out by default. Change <emphasis>EXAMPLE</emphasis>
2045+to match the actual environment.
2046 </para>
2047
2048 </step>
2049@@ -169,7 +183,7 @@
2050 <itemizedlist>
2051 <listitem>
2052 <para>
2053-<emphasis>comment:</emphasis> a short description of the share. Adjust to fit
2054+<emphasis>comment:</emphasis> a short description of the share. Adjust to fit
2055 as appropriate.
2056 </para>
2057 </listitem>
2058@@ -180,17 +194,19 @@
2059 <para>
2060 This example uses <filename>/srv/samba/sharename</filename> because, according
2061 to the <emphasis>Filesystem Hierarchy Standard (FHS)</emphasis>,
2062-<ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.
2063-html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink>
2064-is where site-specific data should be served. Technically Samba shares can be
2065-placed anywhere on the filesystem as long as the permissions are correct, but
2066-adhering to standards is recommended.
2067+<ulink
2068+url="http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">
2069+/srv</ulink> is where site-specific data should be served. Technically,
2070+<application>Samba</application> shares can be placed anywhere on the
2071+filesystem as long as the permissions are correct, but adhering to standards is
2072+recommended.
2073 </para>
2074 </listitem>
2075 <listitem>
2076 <para>
2077-<emphasis>browsable:</emphasis> enables Windows clients to browse the shared
2078-directory using <application>Windows Explorer</application>.
2079+<emphasis>browsable:</emphasis> enables <trademark
2080+class='registered'>Windows</trademark> clients to browse the shared directory
2081+using <application>Windows Explorer</application>.
2082 </para>
2083 </listitem>
2084 <listitem>
2085@@ -201,13 +217,16 @@
2086 </listitem>
2087 <listitem>
2088 <para>
2089-<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.
2090+<emphasis>read only:</emphasis> determines if the share is read only or if
2091+write privileges are granted. Write privileges are allowed only when the value
2092+is <emphasis>no</emphasis>, as is seen in this example. If the value is
2093+<emphasis>yes</emphasis>, then access to the share is read only.
2094 </para>
2095 </listitem>
2096 <listitem>
2097 <para>
2098-<emphasis>create mask:</emphasis> determines the permissions new files will have
2099-when created.
2100+<emphasis>create mask:</emphasis> determines the permissions new files will
2101+have when created.
2102 </para>
2103 </listitem>
2104 </itemizedlist>
2105@@ -217,7 +236,7 @@
2106
2107 <para>
2108 Now that <application>Samba</application> is configured, the directory needs to
2109-be created and the permissions changed. From a terminal enter:
2110+be created and the permissions changed. From a terminal, enter:
2111 </para>
2112
2113 <screen>
2114@@ -227,8 +246,9 @@
2115
2116 <note>
2117 <para>
2118-The <emphasis>-p</emphasis> switch tells mkdir to create the entire directory
2119-tree if it doesn't exist. Change the share name to fit the environment.
2120+The <emphasis>-p</emphasis> switch tells <command>mkdir</command> to create the
2121+entire directory tree if it doesn't exist. Change the share name to fit the
2122+environment.
2123 </para>
2124 </note>
2125
2126@@ -236,7 +256,8 @@
2127 <step>
2128
2129 <para>
2130-Finally, restart the <application>samba</application> services to enable the new configuration:
2131+Finally, restart the <application>samba</application> services to enable the
2132+new configuration:
2133 </para>
2134
2135 <screen>
2136@@ -248,21 +269,23 @@
2137
2138 <warning>
2139 <para>
2140-The above configuration gives all access to any client on the local network. For
2141-a more secure configuration, see <xref linkend="samba-fileprint-security"/>.
2142+The above configuration gives all access to any client on the local network.
2143+For a more secure configuration, see <xref
2144+linkend="samba-fileprint-security"/>.
2145 </para>
2146 </warning>
2147
2148 <para>
2149-From a Windows client, it should now be possible to browse to the &kubuntu; file
2150-server and see the shared directory. To check that everything is working, try
2151-creating a directory from Windows.
2152+From a <trademark class='registered'>Windows</trademark> client, it should now
2153+be possible to browse to the &kubuntu; file server and see the shared
2154+directory. To check that everything is working, try creating a directory from
2155+<trademark class='registered'>Windows</trademark>.
2156 </para>
2157
2158 <para>
2159 To create additional shares, simply create new <emphasis>[dir]</emphasis>
2160 sections in <filename>/etc/samba/smb.conf</filename>, and restart
2161-<emphasis>Samba</emphasis>. Make sure that the directory to be shared actually
2162+<emphasis>Samba</emphasis>. Make sure that the directory to be shared actually
2163 exists and that the permissions are correct.
2164 </para>
2165 </sect2>
2166@@ -273,13 +296,15 @@
2167 <listitem>
2168 <para>
2169 For in depth Samba configurations see the
2170-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
2171+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba
2172+HOWTO Collection</ulink>
2173 </para>
2174 </listitem>
2175 <listitem>
2176 <para>
2177-The guide is also available in
2178-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
2179+The guide is also available in <ulink
2180+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed
2181+format</ulink>.
2182 </para>
2183 </listitem>
2184 <listitem>
2185@@ -300,45 +325,50 @@
2186 <title>Samba Security Modes</title>
2187
2188 <para>
2189-There are two security levels available to the Common Internet Filesystem (CIFS)
2190-network protocol <emphasis>user-level</emphasis> and
2191-<emphasis>share-level</emphasis>. Samba's <emphasis>security mode</emphasis>
2192-implementation allows more flexibility, providing four ways of implementing
2193-user-level security and one way to implement share-level:
2194+There are two security levels available to the Common Internet Filesystem
2195+(<acronym>CIFS</acronym>) network protocol <emphasis>user-level</emphasis> and
2196+<emphasis>share-level</emphasis>. <application>Samba</application>'s
2197+<emphasis>security mode</emphasis> implementation allows more flexibility,
2198+providing four ways of implementing user-level security and one way to
2199+implement share-level:
2200 </para>
2201
2202 <itemizedlist>
2203 <listitem>
2204 <para>
2205 <emphasis>security = user:</emphasis> requires clients to supply a username and
2206-password to connect to shares. Samba user accounts are separate from system
2207-accounts, but the <application>libpam-smbpass</application> package will sync
2208-system users and passwords with the Samba user database.
2209-</para>
2210-</listitem>
2211-<listitem>
2212-<para>
2213-<emphasis>security = domain:</emphasis> this mode allows the Samba server to
2214-appear to Windows clients as a Primary Domain Controller (PDC), Backup Domain
2215-Controller (BDC), or a Domain Member Server (DMS). See
2216-<xref linkend="samba-dc"/> for further information.
2217-</para>
2218-</listitem>
2219-<listitem>
2220-<para>
2221-<emphasis>security = ADS:</emphasis> allows the Samba server to join an Active
2222-Directory domain as a native member. See <xref linkend="samba-ad-integration"/>
2223-for details.
2224-</para>
2225-</listitem>
2226-<listitem>
2227-<para>
2228-<emphasis>security = server:</emphasis> this mode is left over from before Samba
2229-could become a member server, and, due to some security issues, should not be
2230-used. See the <ulink
2231+password to connect to shares. <application>Samba</application> user accounts
2232+are separate from system accounts, but the
2233+<application>libpam-smbpass</application> package will sync system users and
2234+passwords with the <application>Samba</application> user database.
2235+</para>
2236+</listitem>
2237+<listitem>
2238+<para>
2239+<emphasis>security = domain:</emphasis> this mode allows the
2240+<application>Samba</application> server to appear to <trademark
2241+class='registered'>Windows</trademark> clients as a Primary Domain Controller
2242+(<acronym>PDC</acronym>), Backup Domain Controller (<acronym>BDC</acronym>), or
2243+a Domain Member Server (<acronym>DMS</acronym>). See <xref linkend="samba-dc"/>
2244+for further information.
2245+</para>
2246+</listitem>
2247+<listitem>
2248+<para>
2249+<emphasis>security = ADS:</emphasis> allows the
2250+<application>Samba</application> server to join an <trademark
2251+class='registered'>Active Directory</trademark> domain as a native member. See
2252+<xref linkend="samba-ad-integration"/> for details.
2253+</para>
2254+</listitem>
2255+<listitem>
2256+<para>
2257+<emphasis>security = server:</emphasis> this mode is left over from before
2258+<application>Samba</application> could become a member server, and, due to some
2259+security issues, should not be used. See the <ulink
2260 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/ServerType.
2261-html#id349531">Server Security</ulink> section of the Samba guide for more
2262-details.
2263+html#id349531">Server Security</ulink> section of the
2264+<application>Samba</application> guide for more details.
2265 </para>
2266 </listitem>
2267 <listitem>
2268@@ -350,8 +380,8 @@
2269 </itemizedlist>
2270
2271 <para>
2272-The preferred security mode depends on the environment and what the Samba
2273-server needs to accomplish.
2274+The preferred security mode depends on the environment and what the
2275+<application>Samba</application> server needs to accomplish.
2276 </para>
2277
2278 </sect2>
2279@@ -359,15 +389,16 @@
2280 <title>Security = User</title>
2281
2282 <para>
2283-This section will reconfigure the Samba file and print server, from <xref
2284-linkend="samba-fileserver"/> and the
2285-<ulink type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to
2286-require authentication.
2287+This section will reconfigure the <application>Samba</application> file and
2288+print server, from <xref linkend="samba-fileserver"/> and the <ulink
2289+type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to require
2290+authentication.
2291 </para>
2292
2293 <para>
2294-First, install the <application>libpam-smbpass</application> package which will
2295-sync the system users to the Samba user database:
2296+First, install the <application>libpam-smbpass</application> package, which
2297+will sync the system users to the <application>Samba</application> user
2298+database:
2299 </para>
2300
2301 <screen>
2302@@ -376,8 +407,9 @@
2303
2304 <note>
2305 <para>
2306-If the <emphasis>Samba Server</emphasis> task was chosen during installation,
2307-<application>libpam-smbpass</application> is already installed.
2308+If the <emphasis><application>Samba</application> Server</emphasis> task was
2309+chosen during installation, <application>libpam-smbpass</application> is
2310+already installed.
2311 </para>
2312 </note>
2313
2314@@ -391,7 +423,8 @@
2315 </programlisting>
2316
2317 <para>
2318-Finally, restart Samba for the new settings to take effect:
2319+Finally, restart <application>Samba</application> for the new settings to take
2320+effect:
2321 </para>
2322
2323 <screen>
2324@@ -400,14 +433,14 @@
2325
2326 <para>
2327 Now when connecting to the shared directories or printers, there will be a
2328-prompt for a username and password.
2329+prompt for a username and password.
2330 </para>
2331
2332 <note>
2333 <para>
2334-To map a network drive to the share, <quote>Reconnect at Logon</quote> should be
2335-checked, which will require the username and password to be entered just once,
2336-at least until the password changes.
2337+To map a network drive to the share, <quote>Reconnect at Logon</quote> should
2338+be checked, which will require the username and password to be entered just
2339+once &mdash; at least until the password changes.
2340 </para>
2341 </note>
2342
2343@@ -416,47 +449,45 @@
2344 <title>Share Security</title>
2345
2346 <para>
2347-There are several options available to increase the security for each individual
2348-shared directory. Using the <emphasis>[share]</emphasis> example, this section
2349-will cover some common options.
2350+There are several options available to increase the security for each shared
2351+directory. Using the <emphasis>[share]</emphasis> example, this section will
2352+cover some common options.
2353 </para>
2354
2355 <sect3 id="windows-networking-groups">
2356 <title>Groups</title>
2357
2358 <para>
2359-Groups define a collection of computers or users which have a common level of
2360+Groups define a collection of computers or users who have a common level of
2361 access to particular network resources and offer a level of granularity in
2362-controlling access to such resources. For example, if a group
2363-<emphasis role="italic">qa</emphasis> is defined and contains the users
2364-<emphasis role="italic">freda</emphasis>, <emphasis
2365-role="italic">danika</emphasis>, and <emphasis role="italic">rob</emphasis> and
2366-a second group <emphasis role="italic">support</emphasis> is defined and
2367-consists of users <emphasis role="italic">danika</emphasis>,
2368-<emphasis role="italic">jeremy</emphasis>, and <emphasis
2369-role="italic">vincent</emphasis>, then certain network resources configured to
2370-allow access by the <emphasis role="italic">qa</emphasis> group will
2371-subsequently enable access by freda, danika, and rob, but not jeremy or
2372-vincent. Since the user <emphasis role="italic">danika</emphasis>
2373-belongs to both the <emphasis role="italic">qa</emphasis> and <emphasis
2374+controlling access to such resources. For example, if a group <emphasis
2375+role="italic">qa</emphasis> is defined and contains the users <emphasis
2376+role="italic">freda</emphasis>, <emphasis role="italic">danika</emphasis>, and
2377+<emphasis role="italic">rob</emphasis>, and a second group <emphasis
2378+role="italic">support</emphasis> is defined and consists of users <emphasis
2379+role="italic">danika</emphasis>, <emphasis role="italic">jeremy</emphasis>, and
2380+<emphasis role="italic">vincent</emphasis>, then certain network resources
2381+configured to allow access by the <emphasis role="italic">qa</emphasis> group
2382+will subsequently enable access by freda, danika, and rob, but not jeremy or
2383+vincent. Since the user <emphasis role="italic">danika</emphasis> belongs to
2384+both the <emphasis role="italic">qa</emphasis> and <emphasis
2385 role="italic">support</emphasis> groups, she will be able to access resources
2386 configured for access by both groups, whereas all other users will have only
2387 access to resources explicitly allowing the group they are part of.
2388 </para>
2389
2390-
2391 <para>
2392-By default Samba looks for the local system groups defined in
2393-<filename>/etc/group</filename> to determine which users belong to which
2394-groups. For more information on adding and removing users from groups see
2395-<ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
2396+By default, <application>Samba</application> looks for the local system groups
2397+defined in <filename>/etc/group</filename> to determine which users belong to
2398+which groups. For more information on adding and removing users from groups,
2399+see <ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
2400 </para>
2401
2402 <para>
2403-When defining groups in the Samba configuration file,
2404-<filename>/etc/samba/smb.conf</filename>, the recognized syntax
2405-is to preface the group name with an "@" symbol. For example, to define a group
2406-named <emphasis role="italic">sysadmin</emphasis> in a certain section of the
2407+When defining groups in the <application>Samba</application> configuration
2408+file, <filename>/etc/samba/smb.conf</filename>, the recognized syntax is to
2409+preface the group name with an "@" symbol. For example, to define a group named
2410+<emphasis role="italic">sysadmin</emphasis> in a certain section of the
2411 <filename>/etc/samba/smb.conf</filename>, the group name would be entered as
2412 <emphasis role="bold">@sysadmin</emphasis>.
2413 </para>
2414@@ -466,19 +497,19 @@
2415 <title>File Permissions</title>
2416
2417 <para>
2418-File Permissions define the explicit rights a computer or user has to a
2419-particular directory, file, or set of files. Such permissions may be defined by
2420+File permissions define the explicit rights a computer or user has to a
2421+particular directory, file, or set of files. Such permissions may be defined by
2422 editing the <filename>/etc/samba/smb.conf</filename> file and specifying the
2423 explicit permissions of a defined file share.
2424 </para>
2425
2426 <para>
2427-For example, for a defined Samba share called <emphasis>share</emphasis> and
2428-the need to give <emphasis role="italic">read-only</emphasis> permissions to the
2429-group of users known as <emphasis role="italic">qa</emphasis>, while allowing
2430-write permissions to the share by the group called
2431-<emphasis role="italic">sysadmin</emphasis> and the user named <emphasis
2432-role="italic">vincent</emphasis>, then the
2433+For example, for a defined <application>Samba</application> share called
2434+<emphasis>share</emphasis> and the need to give <emphasis
2435+role="italic">read-only</emphasis> permissions to the group of users known as
2436+<emphasis role="italic">qa</emphasis>, while allowing write permissions to the
2437+share by the group called <emphasis role="italic">sysadmin</emphasis> and the
2438+user named <emphasis role="italic">vincent</emphasis>, then the
2439 <filename>/etc/samba/smb.conf</filename> file could be edited to add the
2440 following entries under the <emphasis>[share]</emphasis> entry:
2441 </para>
2442@@ -489,11 +520,11 @@
2443 </programlisting>
2444
2445 <para>
2446-Another possible Samba permission is to declare
2447-<emphasis>administrative</emphasis> permissions to a particular shared resource.
2448-Users having administrative permissions may read, write, or modify any
2449-information contained in the resource where the user has been given explicit
2450-administrative permissions.
2451+Another possible <application>Samba</application> permission is to declare
2452+<emphasis>administrative</emphasis> permissions to a particular shared
2453+resource. Users having administrative permissions may read, write, or modify
2454+any information contained in the resource where they have been given
2455+explicit administrative permissions.
2456 </para>
2457
2458 <para>
2459@@ -508,7 +539,8 @@
2460 </programlisting>
2461
2462 <para>
2463-After editing <filename>/etc/samba/smb.conf</filename>, restart Samba for the changes to take effect:
2464+After editing <filename>/etc/samba/smb.conf</filename>, restart
2465+<application>Samba</application> for the changes to take effect:
2466 </para>
2467
2468 <screen>
2469@@ -518,21 +550,25 @@
2470 <note>
2471 <para>
2472 For the <emphasis>read list</emphasis> and <emphasis>write list</emphasis> to
2473-work the Samba security mode must <emphasis>not</emphasis> be set to <emphasis
2474-role="italic">security = share</emphasis>
2475+work, the <application>Samba</application> security mode must
2476+<emphasis>not</emphasis> be set to <emphasis role="italic">security =
2477+share</emphasis>.
2478 </para>
2479 </note>
2480
2481 <para>
2482-Now that Samba has been configured to limit which groups have access to the
2483-shared directory, the filesystem permissions need to be updated.
2484+Now that <application>Samba</application> has been configured to limit which
2485+groups have access to the shared directory, the filesystem permissions need to
2486+be updated.
2487 </para>
2488
2489 <para>
2490-Traditional Linux file permissions do not map well to Windows NT Access Control
2491-Lists (ACLs). Fortunately POSIX ACLs are available on &kubuntu; servers
2492-providing more fine grained control. For example, to enable ACLs on
2493-<filename>/srv</filename> an EXT3 filesystem, edit
2494+Traditional <trademark>Linux</trademark> file permissions do not map well to
2495+<trademark class='registered'>Windows NT Access Control Lists</trademark>
2496+(<acronym>ACL</acronym>s). Fortunately <trademark>POSIX</trademark>
2497+<acronym>ACL</acronym>s are available on &kubuntu; servers providing more
2498+fine-grained control. For example, to enable <acronym>ACL</acronym>s on
2499+<filename>/srv</filename> an <trademark>EXT3</trademark> filesystem, edit
2500 <filename>/etc/fstab</filename> adding the <emphasis>acl</emphasis> option:
2501 </para>
2502
2503@@ -551,18 +587,20 @@
2504
2505 <note>
2506 <para>
2507-The above example assumes <filename>/srv</filename> on a separate partition. If <filename>/srv</filename>,
2508-or wherever the share path is configured, is part of the <filename>/</filename>
2509-partition, a reboot may be required.
2510+The above example assumes <filename>/srv</filename> is on a separate partition.
2511+If <filename>/srv</filename> &mdash; or wherever the share path is configured
2512+&mdash; is part of the <filename>/</filename> partition, a reboot may be
2513+required.
2514 </para>
2515 </note>
2516
2517 <para>
2518-To match the Samba configuration above, the <emphasis>sysadmin</emphasis> group
2519-will be given read, write, and execute permissions to
2520-<filename>/srv/samba/share</filename>, the <emphasis>qa</emphasis> group will be
2521-given read and execute permissions, and the files will be owned by the username
2522-<emphasis>melissa</emphasis>. Enter the following in a terminal:
2523+To match the <application>Samba</application> configuration above, the
2524+<emphasis>sysadmin</emphasis> group will be given read, write, and execute
2525+permissions to <filename>/srv/samba/share</filename>, the
2526+<emphasis>qa</emphasis> group will be given read and execute permissions, and
2527+the files will be owned by the username <emphasis>melissa</emphasis>. Enter the
2528+following in a terminal:
2529 </para>
2530
2531 <screen>
2532@@ -575,15 +613,16 @@
2533 <para>
2534 The <application>setfacl</application> command above gives
2535 <emphasis>execute</emphasis> permissions to all files in the
2536-<filename>/srv/samba/share</filename> directory, which may or may not be
2537+<filename>/srv/samba/share</filename> directory, which may or may not be
2538 desirable.
2539 </para>
2540 </note>
2541
2542 <para>
2543-A Windows client will show that the new file permissions are implemented. See
2544-the <application>acl</application> and <application>setfacl</application> man
2545-pages for more information on POSIX ACLs.
2546+A <trademark class='registered'>Windows</trademark> client will show that the
2547+new file permissions are implemented. See the <application>acl</application>
2548+and <application>setfacl</application> man pages for more information on
2549+<trademark>POSIX</trademark> <acronym>ACL</acronym>s.
2550 </para>
2551
2552 </sect3>
2553@@ -593,16 +632,19 @@
2554
2555 <para>
2556 &kubuntu; comes with the <application>AppArmor</application> security module,
2557-which provides mandatory access controls. The default AppArmor profile for Samba
2558-will need to be adapted to the proper configuration. For more details on using
2559-AppArmor, please refer to the<ulink
2560-url="https://help.ubuntu.com/community/AppArmor"> wiki</ulink>
2561+which provides mandatory access controls. The default
2562+<application>AppArmor</application> profile for
2563+<application>Samba</application> will need to be adapted to the proper
2564+configuration. For more details on using <application>AppArmor</application>,
2565+please refer to the <ulink url="https://help.ubuntu.com/community/AppArmor">
2566+wiki</ulink>.
2567 </para>
2568
2569 <para>
2570-There are default AppArmor profiles for <filename>/usr/sbin/smbd</filename> and
2571-<filename>/usr/sbin/nmbd</filename>, the Samba daemon binaries, as part of the
2572-<application>apparmor-profiles</application> packages. To install the package,
2573+There are default <application>AppArmor</application> profiles for
2574+<filename>/usr/sbin/smbd</filename> and <filename>/usr/sbin/nmbd</filename>,
2575+the <application>Samba</application> daemon binaries, as part of the
2576+<application>apparmor-profiles</application> packages. To install the package
2577 from a terminal prompt, enter:
2578 </para>
2579
2580@@ -619,10 +661,11 @@
2581 <para>
2582 By default the profiles for <application>smbd</application> and
2583 <application>nmbd</application> are in <emphasis>complain</emphasis> mode,
2584-allowing Samba to work without modifying the profile, and only logging errors.
2585-To place the <application>smbd</application> profile into
2586-<emphasis>enforce</emphasis> mode, and have Samba work as expected, the profile
2587-will need to be modified to reflect any directories that are shared.
2588+allowing <application>Samba</application> to work without modifying the
2589+profile, and only logging errors. To place the <application>smbd</application>
2590+profile into <emphasis>enforce</emphasis> mode and have
2591+<application>Samba</application> work as expected, the profile will need to be
2592+modified to reflect any directories that are shared.
2593 </para>
2594
2595 <para>
2596@@ -636,7 +679,7 @@
2597 </programlisting>
2598
2599 <para>
2600-Now place the profile into <emphasis>enforce</emphasis> and reload it:
2601+Now place the profile into <emphasis>enforce</emphasis> mode and reload it:
2602 </para>
2603
2604 <screen>
2605@@ -648,8 +691,8 @@
2606 It is now possible to read, write, and execute files in the shared directory as
2607 normal, and the <application>smbd</application> binary will have access to only
2608 the configured files and directories. Be sure to add entries for each directory
2609-that Samba is configured to share. Any errors will be logged to
2610-<filename>/var/log/syslog</filename>.
2611+that <application>Samba</application> is configured to share. Any errors will
2612+be logged to <filename>/var/log/syslog</filename>.
2613 </para>
2614
2615 </sect2>
2616@@ -659,34 +702,38 @@
2617 <itemizedlist>
2618 <listitem>
2619 <para>
2620-For in depth Samba configurations, see the
2621-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
2622+For in depth <application>Samba</application> configurations, see the
2623+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
2624+<application>Samba</application> HOWTO Collection</ulink>.
2625 </para>
2626 </listitem>
2627 <listitem>
2628 <para>
2629-The guide is also available in
2630-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
2631+The guide is also available in <ulink
2632+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed
2633+format</ulink>.
2634 </para>
2635 </listitem>
2636 <listitem>
2637 <para>
2638 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
2639-Samba</ulink> is also a good reference.
2640+<application>Samba</application></ulink> is also a good reference.
2641 </para>
2642 </listitem>
2643 <listitem>
2644 <para>
2645 <ulink
2646 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/securing-samba.html"
2647->Chapter 18</ulink> of the Samba HOWTO Collection is devoted to security.
2648+>Chapter 18</ulink> of the <application>Samba</application> HOWTO Collection is
2649+devoted to security.
2650 </para>
2651 </listitem>
2652 <listitem>
2653 <para>
2654-For more information on Samba and ACLs, see the
2655-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">Samba ACLs page
2656-</ulink>.
2657+For more information on <application>Samba</application> and ACLs, see the
2658+<ulink
2659+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">
2660+<application>Samba</application> <acronym>ACL</acronym>s page</ulink>.
2661 </para>
2662 </listitem>
2663 </itemizedlist>
2664@@ -697,27 +744,31 @@
2665 <title>Samba as a Domain Controller</title>
2666
2667 <para>
2668-Although it cannot act as an Active Directory Primary Domain Controller (PDC), a
2669-Samba server can be configured to appear as a Windows NT4-style domain
2670-controller. A major advantage of this configuration is the ability to
2671-centralize user and machine credentials. Samba can also use multiple backends
2672-to store the user information.
2673+Although it cannot act as an <trademark class='registered'>Active Directory
2674+Primary Domain Controller</trademark> (<acronym>PDC</acronym>), a
2675+<application>Samba</application> server can be configured to appear as a
2676+<trademark class='registered'>Windows NT</trademark>4-style domain controller.
2677+A major advantage of this configuration is the ability to centralize user and
2678+machine credentials. <application>Samba</application> can also use multiple
2679+backends to store the user information.
2680 </para>
2681
2682 <sect2 id="samba-pdc-smbpasswd">
2683 <title>Primary Domain Controller</title>
2684
2685 <para>
2686-This section covers configuring Samba as a Primary Domain Controller (PDC) using
2687-the default smbpasswd backend.
2688+This section covers configuring <application>Samba</application> as a Primary
2689+Domain Controller (<acronym>PDC</acronym>) using the default
2690+<application>smbpasswd</application> backend.
2691 </para>
2692
2693 <procedure>
2694 <step>
2695
2696 <para>
2697-Install Samba and <application>libpam-smbpass</application> to sync the user
2698-accounts, by entering the following in a terminal prompt:
2699+Install <application>Samba</application> and
2700+<application>libpam-smbpass</application> to sync the user accounts, by
2701+entering the following in a terminal prompt:
2702 </para>
2703
2704 <screen>
2705@@ -728,10 +779,10 @@
2706 <step>
2707
2708 <para>
2709-Next, configure Samba by editing <filename>/etc/samba/smb.conf</filename>. The
2710-<emphasis>security</emphasis> mode should be set to <emphasis
2711-role="italic">user</emphasis>, and the <emphasis>workgroup</emphasis> should
2712-relate to the organization properly:
2713+Next, configure <application>Samba</application> by editing
2714+<filename>/etc/samba/smb.conf</filename>. The <emphasis>security</emphasis>
2715+mode should be set to <emphasis role="italic">user</emphasis>, and the
2716+<emphasis>workgroup</emphasis> should relate to the organization properly:
2717 </para>
2718
2719 <programlisting>
2720@@ -744,7 +795,8 @@
2721 <step>
2722
2723 <para>
2724-In the commented <quote>Domains</quote> section, add or uncomment the following:
2725+In the commented <quote>Domains</quote> section, add or uncomment the
2726+following:
2727 </para>
2728
2729 <programlisting>
2730@@ -753,22 +805,23 @@
2731 logon drive = H:
2732 logon home = \\%N\%U
2733 logon script = logon.cmd
2734-add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d /var/lib/samba -s /bin/false %u
2735+add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d
2736+/var/lib/samba -s /bin/false %u
2737 </programlisting>
2738
2739 <itemizedlist>
2740 <listitem>
2741 <para>
2742-<emphasis>domain logons:</emphasis> provides the netlogon service causing Samba
2743-to act as a domain controller.
2744+<emphasis>domain logons:</emphasis> provides the netlogon service causing
2745+<application>Samba</application> to act as a domain controller.
2746 </para>
2747 </listitem>
2748 <listitem>
2749 <para>
2750-<emphasis>logon path:</emphasis> places the user's Windows profile into their
2751-home directory. It is also possible to configure a
2752-<emphasis>[profiles]</emphasis> share placing all profiles under a single
2753-directory.
2754+<emphasis>logon path:</emphasis> places the user's <trademark
2755+class='registered'>Windows</trademark> profile into their home directory. It is
2756+also possible to configure a <emphasis>[profiles]</emphasis> share placing all
2757+profiles under a single directory.
2758 </para>
2759 </listitem>
2760 <listitem>
2761@@ -784,20 +837,20 @@
2762 <listitem>
2763 <para>
2764 <emphasis>logon script:</emphasis> determines the script to be run locally once
2765-a user has logged in. The script needs to be placed in the
2766-<emphasis>[netlogon]</emphasis> share.
2767+a user has logged in. The script needs to be placed in the
2768+<emphasis>[netlogon]</emphasis> share.
2769 </para>
2770 </listitem>
2771 <listitem>
2772 <para>
2773-<emphasis>add machine script:</emphasis> a script that will automatically create
2774-the <emphasis>Machine Trust Account</emphasis> needed for a workstation to join
2775-the domain.
2776+<emphasis>add machine script:</emphasis> a script that will automatically
2777+create the <emphasis>Machine Trust Account</emphasis> needed for a workstation
2778+to join the domain.
2779 </para>
2780 <para>
2781-In this example, the <emphasis>machines</emphasis> group will need to be created
2782-using the <application>addgroup</application> utility. See <ulink type="help"
2783-url="help:/kubuntu/basics/"> Basics</ulink> for details.
2784+In this example, the <emphasis>machines</emphasis> group will need to be
2785+created using the <application>addgroup</application> utility. See <ulink
2786+type="help" url="help:/kubuntu/basics/"> Basics</ulink> for details.
2787 </para>
2788 </listitem>
2789 </itemizedlist>
2790@@ -833,7 +886,7 @@
2791
2792 <para>
2793 When configured as a domain controller, a <emphasis>[netlogon]</emphasis> share
2794-needs to be configured. To enable the share, uncomment:
2795+needs to be configured. To enable the share, uncomment:
2796 </para>
2797
2798 <programlisting>
2799@@ -849,7 +902,7 @@
2800 <para>
2801 The original <emphasis>netlogon</emphasis> share path is
2802 <filename>/home/samba/netlogon</filename>, but according to the Filesystem
2803-Hierarchy Standard (FHS), <ulink
2804+Hierarchy Standard (<acronym>FHS</acronym>), <ulink
2805 url="http://www.pathname.com/fhs/pub/fhs-2.3.
2806 html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink> is the correct location
2807 for site-specific data provided by the system.
2808@@ -860,7 +913,7 @@
2809 <step>
2810
2811 <para>
2812-Now create the <filename role="directory">netlogon</filename> directory, and an
2813+Now create the <filename role="directory">netlogon</filename> directory and an
2814 empty (for now) <filename>logon.cmd</filename> script file:
2815 </para>
2816
2817@@ -870,8 +923,9 @@
2818 </screen>
2819
2820 <para>
2821-Any normal Windows logon script commands can be entered in
2822-<filename>logon.cmd</filename> to customize the client's environment.
2823+Any normal <trademark class='registered'>Windows</trademark> logon script
2824+commands can be entered in <filename>logon.cmd</filename> to customize the
2825+client's environment.
2826 </para>
2827
2828 </step>
2829@@ -879,9 +933,9 @@
2830
2831 <para>
2832 With <emphasis>root</emphasis> being disabled by default, in order to join a
2833-workstation to the domain, a system group must be mapped to the Windows
2834-<emphasis>Domain Admins</emphasis> group. Using the
2835-<application>net</application> utility, from a terminal enter:
2836+workstation to the domain, a system group must be mapped to the <trademark
2837+class='registered'>Windows</trademark> <emphasis>Domain Admins</emphasis>
2838+group. Using the <application>net</application> utility, from a terminal enter:
2839 </para>
2840
2841 <screen>
2842@@ -892,9 +946,9 @@
2843 <note>
2844 <para>
2845 Change <emphasis role="italic">sysadmin</emphasis> to the preferred group. The
2846-user used to join the domain needs to be a member of the
2847+user used to join the domain needs to be a member of the
2848 <emphasis>sysadmin</emphasis> group, as well as a member of the system
2849-<emphasis>admin</emphasis> group. The <emphasis>admin</emphasis> group allows
2850+<emphasis>admin</emphasis> group. The <emphasis>admin</emphasis> group allows
2851 <application>sudo</application> use.
2852 </para>
2853 </note>
2854@@ -903,7 +957,8 @@
2855 <step>
2856
2857 <para>
2858-Finally, restart Samba to enable the new domain controller:
2859+Finally, restart <application>Samba</application> to enable the new domain
2860+controller:
2861 </para>
2862
2863 <screen>
2864@@ -914,8 +969,10 @@
2865 <step>
2866
2867 <para>
2868-It is now possible to join Windows clients to the Domain in the same manner as
2869-joining them to an NT4 domain running on a Windows server.
2870+It is now possible to join <trademark class='registered'>Windows</trademark>
2871+clients to the domain in the same manner as joining them to an <trademark
2872+class='registered'>NT4</trademark> domain running on a <trademark
2873+class='registered'>Windows</trademark> server.
2874 </para>
2875
2876 </step>
2877@@ -926,32 +983,36 @@
2878 <title>Backup Domain Controller</title>
2879
2880 <para>
2881-With a Primary Domain Controller (PDC) on the network, it is best to have a
2882-Backup Domain Controller (BDC) as well. This will allow clients to authenticate
2883-in case the PDC becomes unavailable.
2884+With a Primary Domain Controller (<acronym>PDC</acronym>) on the network, it is
2885+best to have a Backup Domain Controller (<acronym>BDC</acronym>) as well. This
2886+will allow clients to authenticate in case the <acronym>PDC</acronym> becomes
2887+unavailable.
2888 </para>
2889
2890 <para>
2891-When configuring Samba as a BDC, there must be a way to sync account information
2892-with the PDC. There are multiple ways of accomplishing this, such as
2893+When configuring <application>Samba</application> as a <acronym>BDC</acronym>,
2894+there must be a way to sync account information with the
2895+<acronym>PDC</acronym>. There are multiple ways of accomplishing this, such as
2896 <application>scp</application>, <application>rsync</application>, or by using
2897 <application>LDAP</application> as the <emphasis>passdb backend</emphasis>.
2898 </para>
2899
2900 <para>
2901-Using LDAP is the most robust way to sync account information, because both
2902-domain controllers can use the same information in real time. However, setting
2903-up a LDAP server may be overly complicated for a small number of user and
2904-computer accounts. See Samba<ulink
2905-url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP"> LDAP</ulink> page for
2906-details.
2907+Using <application>LDAP</application> is the most robust way to sync account
2908+information, because both domain controllers can use the same information in
2909+real time. However, setting up an <application>LDAP</application> server may be
2910+overly complicated for a small number of user and computer accounts. See
2911+<application>Samba</application> <ulink
2912+url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP">
2913+<application>LDAP</application></ulink> page for details.
2914 </para>
2915
2916 <procedure>
2917 <step>
2918
2919 <para>
2920-First, install <application>samba</application> and <application>libpam-smbpass</application>. From a terminal enter:
2921+First, install <application>samba</application> and
2922+<application>libpam-smbpass</application>. From a terminal, enter:
2923 </para>
2924
2925 <screen>
2926@@ -976,7 +1037,7 @@
2927 <step>
2928
2929 <para>
2930-In the commented <emphasis>Domains</emphasis> uncomment or add:
2931+In the commented <emphasis>Domains</emphasis>, uncomment or add:
2932 </para>
2933
2934 <programlisting>
2935@@ -988,8 +1049,9 @@
2936 <step>
2937
2938 <para>
2939-Make sure a user has rights to read the files in <filename>/var/lib/samba</filename>. For example, to allow users in the
2940-<emphasis>admin</emphasis> group to <application>scp</application> the files,
2941+Make sure a user has rights to read the files in
2942+<filename>/var/lib/samba</filename>. For example, to allow users in the
2943+<emphasis>admin</emphasis> group to <application>scp</application> the files,
2944 enter:
2945 </para>
2946
2947@@ -1002,7 +1064,7 @@
2948
2949 <para>
2950 Next, sync the user accounts, using <application>scp</application> to copy the
2951-<filename>/var/lib/samba</filename> directory from the PDC:
2952+<filename>/var/lib/samba</filename> directory from the <acronym>PDC</acronym>:
2953 </para>
2954
2955 <screen>
2956@@ -1012,7 +1074,8 @@
2957 <note>
2958 <para>
2959 Replace <emphasis>username</emphasis> with a valid username and
2960-<emphasis>pdc</emphasis> with the hostname or IP Address of the actual PDC.
2961+<emphasis>pdc</emphasis> with the hostname or <acronym>IP</acronym> Address of
2962+the actual <acronym>PDC</acronym>.
2963 </para>
2964 </note>
2965
2966@@ -1031,16 +1094,19 @@
2967 </procedure>
2968
2969 <para>
2970-Test that the Backup Domain controller is working by stopping the Samba daemon
2971-on the PDC, then trying to login to a Windows client joined to the domain.
2972+Test that the Backup Domain controller is working by stopping the
2973+<application>Samba</application> daemon on the <application>PDC</application>,
2974+then trying to login to a <trademark class='registered'>Windows</trademark>
2975+client joined to the domain.
2976 </para>
2977
2978 <para>
2979-If the <emphasis>logon home</emphasis> option has been configured as a directory
2980-on the PDC, and the PDC becomes unavailable, access to the user's
2981-<emphasis>Home</emphasis> drive will also be unavailable. For this reason,
2982-it is best to configure the <emphasis>logon home</emphasis> to reside on a
2983-separate file server from the PDC and BDC.
2984+If the <emphasis>logon home</emphasis> option has been configured as a
2985+directory on the <acronym>PDC</acronym>, and the <acronym>PDC</acronym> becomes
2986+unavailable, access to the user's <emphasis>Home</emphasis> drive will also be
2987+unavailable. For this reason, it is best to configure the <emphasis>logon
2988+home</emphasis> to reside on a separate file server from the
2989+<acronym>PDC</acronym> and <acronym>BDC</acronym>.
2990 </para>
2991
2992 </sect2>
2993@@ -1051,36 +1117,38 @@
2994 <itemizedlist>
2995 <listitem>
2996 <para>
2997-For in depth Samba configurations see the
2998-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
2999+For indepth <application>Samba</application> configurations, see the <ulink
3000+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
3001+<application>Samba</application> HOWTO Collection</ulink>.
3002 </para>
3003 </listitem>
3004 <listitem>
3005 <para>
3006-The guide is also available in
3007-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
3008+The guide is also available in <ulink
3009+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format
3010+</ulink>.
3011 </para>
3012 </listitem>
3013 <listitem>
3014 <para>
3015 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
3016-Samba</ulink> is also a good reference.
3017+<application>Samba</application></ulink> is also a good reference.
3018 </para>
3019 </listitem>
3020 <listitem>
3021 <para>
3022 <ulink
3023 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-pdc.html">
3024-Chapter 4</ulink> of the Samba HOWTO Collection explains setting up a Primary
3025-Domain Controller.
3026+Chapter 4</ulink> of the <application>Samba</application> HOWTO Collection
3027+explains setting up a Primary Domain Controller.
3028 </para>
3029 </listitem>
3030 <listitem>
3031 <para>
3032 <ulink
3033 url="http://us3.samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-bdc.html">
3034-Chapter 5</ulink> of the Samba HOWTO Collection explains setting up a Backup
3035-Domain Controller.
3036+Chapter 5</ulink> of the <application>Samba</application> HOWTO Collection
3037+explains setting up a Backup Domain Controller.
3038 </para>
3039 </listitem>
3040 </itemizedlist>
3041@@ -1095,14 +1163,16 @@
3042 <title>Accessing a Samba Share</title>
3043
3044 <para>
3045-Another use for Samba is to integrate into an existing Windows network. Once
3046-part of an Active Directory (AD) domain, Samba can provide file and print
3047-services to AD users.
3048+Another use for <application>Samba</application> is to integrate into an
3049+existing <trademark class='registered'>Windows</trademark> network. Once part
3050+of an <trademark class='registered'>Active Directory</trademark>
3051+(<acronym>AD</acronym>) domain, <application>Samba</application> can provide
3052+file and print services to <acronym>AD</acronym> users.
3053 </para>
3054
3055 <para>
3056-The simplest way to join an AD domain is to use
3057-<application>Likewise-open</application>. For detailed instructions, see <xref
3058+The simplest way to join an <acronym>AD</acronym> domain is to use
3059+<application>Likewise-open</application>. For detailed instructions, see <xref
3060 linkend="likewise-open"/>.
3061 </para>
3062
3063@@ -1115,13 +1185,15 @@
3064 </screen>
3065
3066 <para>
3067-Since the <application>likewise-open</application> and <application>samba</application> packages use separate
3068+Since the <application>likewise-open</application> and
3069+<application>samba</application> packages use separate
3070 <filename>secrets.tdb</filename> files, a symlink must be created in <filename
3071 role="directory">/var/lib/samba</filename>:
3072 </para>
3073
3074 <screen>
3075-<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig</command>
3076+<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig
3077+</command>
3078 <command>sudo ln -s /etc/samba/secrets.tdb /var/lib/samba</command>
3079 </screen>
3080
3081@@ -1150,10 +1222,10 @@
3082
3083 <para>
3084 It should now be possible to access any <application>Samba</application> shares
3085-from a Windows client. However, be sure to give the appropriate AD users or
3086-groups access to the share directory. See <xref
3087-linkend="samba-fileprint-security"/> for
3088-more details.
3089+from a <trademark class='registered'>Windows</trademark> client. However, be
3090+sure to give the appropriate <acronym>AD</acronym> users or groups access to
3091+the share directory. See <xref linkend="samba-fileprint-security"/> for more
3092+details.
3093 </para>
3094
3095 </sect2>
3096@@ -1162,23 +1234,25 @@
3097 <title>Accessing a Windows Share</title>
3098
3099 <para>
3100-Now that the Samba server is part of the Active Directory domain, any Windows
3101-server shares can be accessed:
3102+Now that the <application>Samba</application> server is part of the <trademark
3103+class='registered'>Active Directory</trademark> domain, any <trademark
3104+class='registered'>Windows</trademark> server shares can be accessed:
3105 </para>
3106
3107 <itemizedlist>
3108 <listitem>
3109
3110 <para>
3111-To mount a Windows file share, enter the following in a terminal prompt:
3112+To mount a <trademark class='registered'>Windows</trademark> file share, enter
3113+the following in a terminal prompt:
3114 </para>
3115 <screen>
3116 <command>mount.cifs //fs01.example.com/share mount_point</command>
3117 </screen>
3118
3119 <para>
3120-It is also possible to access shares on computers not part of an AD domain, but
3121-a username and password must be provided.
3122+It is also possible to access shares on computers not part of an
3123+<acronym>AD</acronym> domain, but a username and password must be provided.
3124 </para>
3125
3126 </listitem>
3127@@ -1186,7 +1260,7 @@
3128
3129 <para>
3130 To mount the share during boot, place an entry in
3131-<filename>/etc/fstab</filename>, for example:
3132+<filename>/etc/fstab</filename>. For example:
3133 </para>
3134
3135 <programlisting>
3136@@ -1197,9 +1271,10 @@
3137 <listitem>
3138
3139 <para>
3140-Another way to copy files from a Windows server is to use the
3141-<application>smbclient</application> utility. To list the files in a Windows
3142-share:
3143+Another way to copy files from a <trademark
3144+class='registered'>Windows</trademark> server is to use the
3145+<application>smbclient</application> utility. To list the files in a <trademark
3146+class='registered'>Windows</trademark> share:
3147 </para>
3148
3149 <screen>
3150@@ -1229,11 +1304,13 @@
3151 </para>
3152
3153 <screen>
3154-<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"</command>
3155+<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"
3156+</command>
3157 </screen>
3158
3159 <para>
3160-This will copy the <filename>/etc/hosts</filename> to <filename>//fs01.example.com/share/hosts</filename>.
3161+This will copy the <filename>/etc/hosts</filename> to
3162+<filename>//fs01.example.com/share/hosts</filename>.
3163 </para>
3164
3165 </listitem>
3166@@ -1241,10 +1318,11 @@
3167
3168 <para>
3169 The <emphasis>-c</emphasis> option used above allows execution of the
3170-<application>smbclient</application> command all at once. This is useful for
3171-scripting and minor file operations. To enter the <emphasis>smb:
3172-\&gt;</emphasis> prompt, an FTP-like prompt where normal file and directory
3173-commands can be executed, simply run the following in Konsole:
3174+<application>smbclient</application> command all at once. This is useful for
3175+scripting and minor file operations. To enter the <emphasis>smb:
3176+\&gt;</emphasis> prompt, an <acronym>FTP</acronym>-like prompt where normal
3177+file and directory commands can be executed, simply run the following in
3178+<application>Konsole</application>:
3179 </para>
3180
3181 <screen>
3182@@ -1256,11 +1334,12 @@
3183
3184 <note>
3185 <para>
3186-Replace all instances of <emphasis>fs01.example.com/share</emphasis>, <emphasis>//192.168.0.5/share</emphasis>,
3187+Replace all instances of <emphasis>fs01.example.com/share</emphasis>,
3188+<emphasis>//192.168.0.5/share</emphasis>,
3189 <emphasis>username=steve,password=secret</emphasis>, and
3190-<emphasis>file.txt</emphasis> with the proper server IP, hostname,
3191-share name, file name, and an actual username and password with rights to the
3192-share.
3193+<emphasis>file.txt</emphasis> with the proper server <acronym>IP</acronym>,
3194+hostname, share name, file name, and an actual username and password with
3195+rights to the share.
3196 </para>
3197 </note>
3198
3199@@ -1269,9 +1348,11 @@
3200 <title>Resources</title>
3201
3202 <para>
3203-For more <application>smbclient</application> options see the man page:
3204+For more <application>smbclient</application> options, see the man page:
3205 <command>man smbclient</command>, also available
3206-<ulink url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">online</ulink>.
3207+<ulink
3208+url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">
3209+online</ulink>.
3210 </para>
3211
3212 <para>
3213@@ -1289,24 +1370,27 @@
3214
3215 <para>
3216 <application>Likewise Open</application> simplifies the necessary configuration
3217-needed to authenticate a Linux machine to an Active Directory domain. Based on
3218-<application>winbind</application>, the <application>likewise-open</application>
3219-package takes the pain out of integrating &kubuntu; authentication into an
3220-existing Windows network.
3221+needed to authenticate a <trademark>Linux</trademark> machine to an <trademark
3222+class='registered'>Active Directory</trademark> domain. Based on
3223+<application>winbind</application>, the
3224+<application>likewise-open</application> package takes the pain out of
3225+integrating &kubuntu; authentication into an existing <trademark
3226+class='registered'>Windows</trademark> network.
3227 </para>
3228
3229 <sect2 id="likewise-open-install">
3230 <title>Installation</title>
3231
3232 <para>
3233-There are two ways to use Likewise Open,
3234+There are two ways to use Likewise Open:
3235 <application>likewise-open</application> the command line utility and
3236-<application>likewise-open-gui</application>. This section focuses on the
3237+<application>likewise-open-gui</application>. This section focuses on the
3238 command line utility.
3239 </para>
3240
3241 <para>
3242-To install the <application>likewise-open</application> package, open a terminal prompt and enter:
3243+To install the <application>likewise-open</application> package, open a
3244+terminal and enter:
3245 </para>
3246
3247 <screen>
3248@@ -1322,7 +1406,7 @@
3249 </para>
3250
3251 <para>
3252-To install <application>Likewise Open 5.0</application> enter:
3253+To install <application>Likewise Open 5.0</application>, enter:
3254 </para>
3255
3256 <screen>
3257@@ -1331,8 +1415,9 @@
3258
3259 <warning>
3260 <para>
3261-Installing likewise-open5 over an existing likewise-open (4.1) installation will
3262-replace it. The domain will have to be rejoined after install.
3263+Installing <application>likewise-open5</application> over an existing
3264+<application>likewise-open</application> (4.1) installation will replace it.
3265+The domain will have to be rejoined after install.
3266 </para>
3267 </warning>
3268
3269@@ -1349,25 +1434,29 @@
3270 <itemizedlist>
3271 <listitem>
3272 <para>
3273-Access to an Active Directory user with appropriate rights to join the domain.
3274-</para>
3275-</listitem>
3276-<listitem>
3277-<para>
3278-The <emphasis>Fully Qualified Domain Name</emphasis> (FQDN) of the domain
3279-being joined. If the AD domain does not match a valid domain such as <emphasis
3280-role="italic">example.com</emphasis>, it is likely that it is in the form of
3281-<emphasis>domainname.local</emphasis>.
3282-</para>
3283-</listitem>
3284-<listitem>
3285-<para>
3286-DNS for the domain set up properly. In a production AD environment, this
3287-is typically the case. Proper Microsoft DNS is needed so that client
3288-workstations can determine that the Active Directory domain is available.
3289-</para>
3290-<para>
3291-If there is not a Windows DNS server on the network, see <xref
3292+Access to an <trademark class='registered'>Active Directory</trademark> user
3293+with appropriate rights to join the domain.
3294+</para>
3295+</listitem>
3296+<listitem>
3297+<para>
3298+The <emphasis>Fully Qualified Domain Name</emphasis> (<acronym>FQDN</acronym>)
3299+of the domain being joined. If the <acronym>AD</acronym> domain does not match
3300+a valid domain such as <emphasis role="italic">example.com</emphasis>, it is
3301+likely that it is in the form of <emphasis>domainname.local</emphasis>.
3302+</para>
3303+</listitem>
3304+<listitem>
3305+<para>
3306+<acronym>DNS</acronym> for the domain set up properly. In a production
3307+<acronym>AD</acronym> environment, this is typically the case. Proper
3308+<trademark class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is
3309+needed so that client workstations can determine that the <trademark
3310+class='registered'>Active Directory</trademark> domain is available.
3311+</para>
3312+<para>
3313+If there is not a <trademark class='registered'>Windows</trademark>
3314+<acronym>DNS</acronym> server on the network, see <xref
3315 linkend="likewise-open-ms-dns"/> for details.
3316 </para>
3317
3318@@ -1390,22 +1479,23 @@
3319 </note>
3320
3321 <para>
3322-There will be a prompt for the user's password. If all goes well, a
3323+There will be a prompt for the user's password. If all goes well, a
3324 <emphasis>SUCCESS</emphasis> message should be printed to the console.
3325 </para>
3326
3327 <note>
3328 <para>
3329-After joining the domain, it is necessary to reboot before
3330-attempting to authenticate against the domain.
3331+After joining the domain, it is necessary to reboot before attempting to
3332+authenticate against the domain.
3333 </para>
3334 </note>
3335
3336 <para>
3337-After successfully joining an &kubuntu; machine to an Active Directory domain,
3338-any valid AD user can be used to authenticate. To login, the user name must be
3339-entered as 'domain\username'. For example to ssh to a server joined to the
3340-domain, enter:
3341+After successfully joining an &kubuntu; machine to an <trademark
3342+class='registered'>Active Directory</trademark> domain, any valid
3343+<acronym>AD</acronym> user can be used to authenticate. To log in, the user
3344+name must be entered as 'domain\username'. For example, to
3345+<command>ssh</command> to a server joined to the domain, enter:
3346 </para>
3347
3348 <screen>
3349@@ -1414,14 +1504,15 @@
3350
3351 <note>
3352 <para>
3353-If configuring a Desktop, the user name will need to be prefixed with <emphasis
3354+If configuring a desktop, the user name will need to be prefixed with <emphasis
3355 role="italic">domain\</emphasis> in the graphical logon as well.
3356 </para>
3357 </note>
3358
3359 <para>
3360-To make likewise-open use a default domain, the following statement can be added
3361-to <filename>/etc/samba/lwiauthd.conf</filename>:
3362+To make <application>likewise-open</application> use a default domain, the
3363+following statement can be added to
3364+<filename>/etc/samba/lwiauthd.conf</filename>:
3365 </para>
3366
3367 <programlisting>
3368@@ -1439,14 +1530,14 @@
3369 <note>
3370 <para>
3371 Once configured for a <emphasis>default domain</emphasis>, the <emphasis
3372-role="italic">'domain\'</emphasis> is no longer required. Users can login using
3373-only their username.
3374+role="italic">'domain\'</emphasis> is no longer required. Users can log in
3375+using only their username.
3376 </para>
3377 </note>
3378
3379 <para>
3380 The <application>domainjoin-cli</application> utility can also be used to leave
3381-the domain. From a terminal:
3382+the domain. From a terminal:
3383 </para>
3384
3385 <screen>
3386@@ -1459,34 +1550,36 @@
3387
3388 <para>
3389 The <application>likewise-open</application> package comes with a few other
3390-utilities that may be useful for gathering information about the Active
3391-Directory environment. These utilities are used to join the machine to the
3392-domain, and are the same as those available in the
3393-<application>samba-common</application> and <application>winbind</application>
3394-packages:
3395+utilities that may be useful for gathering information about the <trademark
3396+class='registered'>Active Directory</trademark> environment. These utilities
3397+are used to join the machine to the domain, and are the same as those available
3398+in the <application>samba-common</application> and
3399+<application>winbind</application> packages:
3400 </para>
3401
3402 <itemizedlist>
3403 <listitem>
3404 <para>
3405-<application>lwinet</application>: Returns information about the network and the domain.
3406-</para>
3407-</listitem>
3408-<listitem>
3409-<para>
3410-<application>lwimsg</application>: Allows interaction with the <application>likewise-winbindd</application> daemon.
3411-</para>
3412-</listitem>
3413-<listitem>
3414-<para>
3415-<application>lwiinfo</application>: Displays information about various parts of
3416-the Domain.
3417+<application>lwinet</application>: Returns information about the network and
3418+the domain.
3419+</para>
3420+</listitem>
3421+<listitem>
3422+<para>
3423+<application>lwimsg</application>: Allows interaction with the
3424+<application>likewise-winbindd</application> daemon.
3425+</para>
3426+</listitem>
3427+<listitem>
3428+<para>
3429+<application>lwiinfo</application>: Displays information about various parts of
3430+the domain.
3431 </para>
3432 </listitem>
3433 </itemizedlist>
3434
3435 <para>
3436-Please refer to each utility's man page specific for details.
3437+Please refer to each utility's man page for details.
3438 </para>
3439
3440 </sect2>
3441@@ -1496,8 +1589,9 @@
3442 <itemizedlist>
3443 <listitem>
3444 <para>
3445-If the client has trouble joining the domain, check that the Microsoft DNS is
3446-listed first in <filename>/etc/resolv.conf</filename>.
3447+If the client has trouble joining the domain, check that the <trademark
3448+class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is listed first
3449+in <filename>/etc/resolv.conf</filename>.
3450 For example:
3451 </para>
3452
3453@@ -1507,26 +1601,30 @@
3454 </listitem>
3455 <listitem>
3456 <para>
3457-For more information when joining a domain, use the <emphasis>--loglevel verbose</emphasis> or <emphasis>--advanced</emphasis> option of the
3458+For more information when joining a domain, use the <emphasis>--loglevel
3459+verbose</emphasis> or <emphasis>--advanced</emphasis> option of the
3460 <application>domainjoin-cli</application> utility:
3461 </para>
3462
3463 <screen>
3464-<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator</command>
3465+<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator
3466+</command>
3467 </screen>
3468 </listitem>
3469 <listitem>
3470 <para>
3471-If an Active Directory user has trouble logging in, check the <filename>/var/log/auth.log</filename> for details.
3472+If an <trademark class='registered'>Active Directory</trademark> user has
3473+trouble logging in, check the <filename>/var/log/auth.log</filename> for
3474+details.
3475 </para>
3476 </listitem>
3477 <listitem>
3478 <para>
3479-When joining an &kubuntu; Desktop workstation to a domain, it may be necessary
3480-to edit <filename>/etc/nsswitch.conf</filename> if the AD domain uses the
3481-<emphasis role="italic">.local</emphasis> syntax. In order to join the domain,
3482-the <emphasis>"mdns4"</emphasis> entry should be removed from the
3483-<emphasis>hosts</emphasis> option. For example:
3484+When joining a &kubuntu; Desktop workstation to a domain, it may be necessary
3485+to edit <filename>/etc/nsswitch.conf</filename> if the <acronym>AD</acronym>
3486+domain uses the <emphasis role="italic">.local</emphasis> syntax. In order to
3487+join the domain, the <emphasis>"mdns4"</emphasis> entry should be removed from
3488+the <emphasis>hosts</emphasis> option. For example:
3489 </para>
3490
3491 <programlisting>
3492@@ -1550,7 +1648,8 @@
3493 </screen>
3494
3495 <para>
3496-It should now be possible to join the Active Directory domain.
3497+It should now be possible to join the <trademark
3498+class='registered'>Active Directory</trademark> domain.
3499 </para>
3500 </listitem>
3501 </itemizedlist>
3502@@ -1560,9 +1659,10 @@
3503 <title>Microsoft DNS</title>
3504
3505 <para>
3506-The following are instructions for installing DNS on an Active Directory domain
3507-controller running Windows Server 2003, but the instructions should be similar
3508-for other versions:
3509+The following are instructions for installing <acronym>DNS</acronym> on an
3510+<trademark class='registered'>Active Directory</trademark> domain controller
3511+running <trademark class='registered'>Windows Server 2003</trademark>, but the
3512+instructions should be similar for other versions:
3513 </para>
3514
3515 <!-- Translators: please check http://www.microsoft.com/language/en/us/search.mspx to see how this string is translated in Windows to your language -->
3516@@ -1577,41 +1677,62 @@
3517 This will open the <application>Server Role Management</application> utility.
3518 </para>
3519 <orderedlist>
3520-<listitem><para>Click <guilabel>Add or remove a role</guilabel></para></listitem>
3521-<listitem><para>Click Next</para></listitem>
3522-<listitem><para>Select "DNS Server"</para></listitem>
3523-<listitem><para>Click Next</para></listitem>
3524-<listitem><para>Click Next again to proceed </para></listitem>
3525-<listitem><para>Select "Create a forward lookup zone" if it is not selected.</para></listitem>
3526-<listitem><para>Click Next</para></listitem>
3527-<listitem><para>Make sure "This server maintains the zone" is selected and click Next.</para></listitem>
3528-<listitem><para>Enter the domain name and click Next</para></listitem>
3529-<listitem><para>Click Next to "Allow only secure dynamic updates"</para></listitem>
3530+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Add or remove a
3531+role</guilabel>.</para></listitem>
3532+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3533+</para></listitem>
3534+<listitem><para>Select "<acronym>DNS</acronym> Server".</para></listitem>
3535+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3536+</para></listitem>
3537+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>
3538+again to proceed.</para></listitem>
3539+<listitem><para>Select "Create a forward lookup zone" if it is not selected.
3540+</para></listitem>
3541+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3542+</para></listitem>
3543+<listitem><para>Make sure "This server maintains the zone" is selected and
3544+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.</para></listitem>
3545+<listitem><para>Enter the domain name and <mousebutton>click</mousebutton>
3546+<guilabel>Next</guilabel>.</para></listitem>
3547+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel> to
3548+"Allow only secure dynamic updates".</para></listitem>
3549 <listitem>
3550 <para>
3551-Enter the IP for DNS servers to forward queries to, or Select "No, it should not forward queries" and click Next.
3552+Enter the <acronym>IP</acronym> for <acronym>DNS</acronym> servers to forward
3553+queries to, or Select "No, it should not forward queries" and
3554+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.
3555 </para>
3556 </listitem>
3557-<listitem><para>Click Finish</para></listitem>
3558-<listitem><para>Click Finish</para></listitem>
3559+<listitem><para><mousebutton>Click</mousebutton>
3560+<guilabel>Finish</guilabel></para></listitem>
3561+<listitem><para><mousebutton>Click</mousebutton>
3562+<guilabel>Finish</guilabel></para></listitem>
3563 </orderedlist>
3564 <para>
3565-DNS is now installed and can be further configured using the <application>Microsoft Management Console</application> DNS snap-in.
3566+<acronym>DNS</acronym> is now installed and can be further configured using the
3567+<application>Microsoft Management Console</application> <acronym>DNS</acronym>
3568+snap-in.
3569 </para>
3570 </listitem>
3571 <listitem>
3572 <para>
3573-Next, configure the Server to use itself for DNS queries:
3574+Next, configure the server to use itself for <acronym>DNS</acronym> queries:
3575 <orderedlist>
3576-<listitem><para>Click Start</para></listitem>
3577+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Start</guilabel>
3578+</para></listitem>
3579 <listitem><para>Control Panel</para></listitem>
3580 <listitem><para>Network Connections</para></listitem>
3581-<listitem><para>Right Click "Local Area Connection"</para></listitem>
3582-<listitem><para>Click Properties</para></listitem>
3583-<listitem><para>Double click "Internet Protocol (TCP/IP)"</para></listitem>
3584-<listitem><para>Enter the Server's IP Address as the "Preferred DNS server"</para></listitem>
3585-<listitem><para>Click Ok</para></listitem>
3586-<listitem><para>Click Ok again to save the settings</para></listitem>
3587+<listitem><para><mousebutton>Right click</mousebutton> "Local Area Connection"
3588+</para></listitem>
3589+<listitem><para><mousebutton>Click</mousebutton> Properties</para></listitem>
3590+<listitem><para><mousebutton>Double click</mousebutton> "Internet Protocol
3591+(<acronym>TCP</acronym>/<acronym>IP</acronym>)"</para></listitem>
3592+<listitem><para>Enter the server's <acronym>IP</acronym> address as the
3593+"Preferred <acronym>DNS</acronym> server"</para></listitem>
3594+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton>
3595+</para></listitem>
3596+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton>
3597+again to save the settings</para></listitem>
3598 </orderedlist>
3599 </para>
3600 </listitem>
3601@@ -1621,11 +1742,13 @@
3602 <title>References</title>
3603
3604 <para>
3605-Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise</ulink> home page for further information.
3606+Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise
3607+</ulink> home page for further information.
3608 </para>
3609
3610 <para>
3611-For more <application>domainjoin-cli</application> options see the man page: <command>man domainjoin-cli</command>.
3612+For more <application>domainjoin-cli</application> options, see the man page:
3613+<command>man domainjoin-cli</command>.
3614 </para>
3615
3616 </sect2>
3617
3618=== modified file 'docs/video/C/video.xml'
3619--- docs/video/C/video.xml 2011-09-15 06:32:00 +0000
3620+++ docs/video/C/video.xml 2012-03-22 09:34:17 +0000
3621@@ -21,14 +21,15 @@
3622 <sect1 id="introduction">
3623 <title>Introduction</title>
3624 <para>
3625-&kubuntu; comes with a video player installed by default called
3626-<application>Dragon Player</application>. It is a simple and lightweight video
3627+&kubuntu; comes with a video player installed by default called
3628+<application>Dragon Player</application>. It is a simple and light-weight video
3629 player that can play almost any video file (provided the necessary codecs are
3630-installed). For video editing, the preferred choice is
3631-<application>Kino</application>, a non-linear video editor.
3632-<application>Kino</application> is not installed by default with &kubuntu;, but
3633-it can be easily installed from the &kubuntu; Software Center:
3634-(<application>Muon</application>).
3635+installed). For video editing, the preferred choice is
3636+<application>Kino</application> &mdash; a non-linear video editor.
3637+<application>Kino</application> is not installed by default in &kubuntu;, but
3638+can be easily installed from the &kubuntu; Software Center:
3639+(<application>Muon</application>), which can be started by choosing
3640+&menusysmuon;.
3641 </para>
3642 </sect1>
3643
3644@@ -41,16 +42,20 @@
3645
3646 <procedure>
3647 <title>Open Files From The File Manager</title>
3648-<step><para>Open the <application>Dolphin</application> file manager.</para></step>
3649+<step><para>Open the <application>Dolphin</application> file manager.
3650+</para></step>
3651 <step><para>Navigate to the video file.</para></step>
3652-<step><para>Click on the file name to open it with the default video player (<application>Dragon Player</application>).</para></step>
3653+<step><para>Click on the file name to open it with the default video player
3654+(<application>Dragon Player</application>).</para></step>
3655 </procedure>
3656
3657 <procedure>
3658 <title>Open Files From Within Dragon Player</title>
3659-<step><para>Open <application>Dragon Player</application>; &menudragon;</para></step>
3660-<step><para>Click on the <guibutton>Play File</guibutton> button or press <keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
3661-<step><para>Navigate to the selected video file, and click
3662+<step><para>Open <application>Dragon Player</application>; &menudragon;</para>
3663+</step>
3664+<step><para>Click on the <guibutton>Play File</guibutton> button or press
3665+<keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
3666+<step><para>Navigate to the selected video file, and click
3667 <guibutton>Open</guibutton></para></step>
3668 </procedure>
3669
3670@@ -61,11 +66,11 @@
3671 <title>Editing Videos</title>
3672 <para>
3673 Video editing in &kubuntu; can be done with an application called
3674-<application>Kino</application> a non-linear video editor.
3675+<application>Kino</application> &mdash; a non-linear video editor.
3676 <application>Kino</application> is not installed by default. It can be
3677-installed using <application>Muon</application> by going
3678-to &menusysmuon;.</para>
3679-<para>Here's how to open and edit video files in
3680+installed using <application>Muon</application> by going to &menusysmuon;.
3681+</para>
3682+<para>Here's how to open and edit video files in
3683 <application>Kino</application>:
3684 </para>
3685
3686@@ -84,11 +89,12 @@
3687 <para>To trim a video to shorten it or to export different sections:</para>
3688 <procedure>
3689 <title>Trimming Videos</title>
3690-<step><para>Once a video file has been imported into
3691+<step><para>Once a video file has been imported into
3692 <application>Kino</application>, click on the <guibutton>Trim</guibutton>
3693 button.</para></step>
3694-<step><para>A slider below the video preview can be used to specify the starting
3695-(In Point) and the ending (Out Point) points of the trimmed video.</para></step>
3696+<step><para>A slider below the video preview can be used to specify the
3697+starting (In Point) and the ending (Out Point) points of the trimmed video.
3698+</para></step>
3699 <step><para>Specify the starting and ending points by dragging each end of the
3700 slider.</para></step>
3701 <step><para>After the sliders have been positioned, press the
3702@@ -98,21 +104,20 @@
3703
3704 <procedure>
3705 <title>Exporting videos</title>
3706-<step><para>When the editing, trimming, etc. are complete, the video is ready
3707-to be exported. To do this, click on the <guibutton>Export</guibutton> on the
3708-right side of the window or go to
3709-<menuchoice><guimenu>View</guimenu><guisubmenu>Export</guisubmenu></menuchoice
3710->.</para></step>
3711+<step><para>When the editing, trimming, etc., are complete, the video is ready
3712+to be exported. To do this, click on the <guibutton>Export</guibutton> button
3713+on the right side of the window or go to <menuchoice><guimenu>View</guimenu>
3714+<guisubmenu>Export</guisubmenu></menuchoice>.</para></step>
3715 <step><para>In the Export mode, the output mode can be specified for saving the
3716-edited video. Exporting to a 'DV' file maintains the quality of the video (this
3717-generally results in a large file).</para></step>
3718+edited video. Exporting to a '<acronym>DV</acronym>' file maintains the quality
3719+of the video (this generally results in a large file).</para></step>
3720 <step><para>To export the video to a common format such as
3721 <acronym>AVI</acronym>, select the 'Other' tab and specify the type of video to
3722-export, the quality of the output video and the location where the
3723-video should be saved.</para></step>
3724+export, the quality of the output video and the location the video should be
3725+saved to.</para></step>
3726 <step><para>When the settings have been customized, click on the
3727-<guibutton>Export</guibutton> button to export the file. This may take some time
3728-depending on the size of file, the format, the quality selected and other
3729+<guibutton>Export</guibutton> button to export the file. This may take some
3730+time depending on the size of file, the format, the quality selected, and other
3731 customization choices.</para></step>
3732 </procedure>
3733 </sect1>
3734@@ -120,14 +125,15 @@
3735 <sect1 id="video-codecs">
3736 <title>Video Codecs</title>
3737 <para>
3738-Codecs are software that allow different types of video/audio files to be
3739-played. Some codecs are proprietary, meaning that a license is required to use
3740-them. Some codecs are available under free licenses like GPL.
3741+Codecs are software that allow different types of video/audio files to be
3742+played. Some codecs are proprietary &mdash; meaning that a license is required
3743+to use them. Some codecs are available under free licenses like the
3744+<acronym>GPL</acronym>.
3745 </para>
3746 <para>
3747 &kubuntu; does not come pre-installed with codecs to play proprietary formats
3748-like mp3, rm (Real Media) and others. The necessary codecs can be installed from
3749-the repositories.
3750+like mp3, rm (<trademark>Real Media</trademark>), and others. The necessary
3751+codecs can be installed from the repositories.
3752 </para>
3753 <para>
3754 For more information on which formats are supported out of the box by &kubuntu;

Subscribers

People subscribed via source and target branches

to all changes: