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

Proposed by Little Girl
Status: Merged
Merged at revision: 266
Proposed branch: lp:~littlergirl/kubuntu-docs/network
Merge into: lp:kubuntu-docs/precise
Diff against target: 3901 lines (+1043/-875)
7 files modified
docs/audio/C/audio.xml (+47/-45)
docs/bugs/C/bugs.xml (+215/-169)
docs/cli/C/cli.xml (+143/-158)
docs/network/C/network.xml (+30/-27)
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/network
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+98898@code.launchpad.net

Description of the change

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

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 18:52:20 +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 18:52:20 +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 18:52:20 +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/network/C/network.xml'
1702--- docs/network/C/network.xml 2010-07-23 02:20:29 +0000
1703+++ docs/network/C/network.xml 2012-03-22 18:52:20 +0000
1704@@ -14,7 +14,7 @@
1705 <abstract>
1706 <para>
1707 This document provides information about configuring systems to connect
1708-to networks, the Internet, and other machines on a shared network.
1709+to networks, the internet, and other machines on a shared network.
1710 </para>
1711 </abstract>
1712 </articleinfo>
1713@@ -66,9 +66,10 @@
1714 </step>
1715 <step>
1716 <para>
1717-Select the desired connection if it is available and click the
1718-<guibutton>Edit...</guibutton> button. If the proper connection is not
1719-available, click the <guibutton>Add...</guibutton> button.
1720+Select the desired connection if it is available and
1721+<mousebutton>click</mousebutton> the <guibutton>Edit...</guibutton> button. If
1722+the proper connection is not available, <mousebutton>click</mousebutton> the
1723+<guibutton>Add...</guibutton> button.
1724 </para>
1725 </step>
1726 <step>
1727@@ -79,12 +80,14 @@
1728 </step>
1729 <step>
1730 <para>
1731-Enter the details and click the <guibutton>OK</guibutton> button.
1732+Enter the details and <mousebutton>click</mousebutton> the
1733+<guibutton>OK</guibutton> button.
1734 </para>
1735 </step>
1736 <step>
1737 <para>
1738-Click the <guibutton>OK</guibutton> in the main window.
1739+<mousebutton>Click</mousebutton> the <guibutton>OK</guibutton> in the main
1740+window.
1741 </para>
1742 </step>
1743 </procedure>
1744@@ -95,13 +98,13 @@
1745 <sect1 id="wireless">
1746 <title>Wireless</title>
1747 <para>
1748-In some cases, the wireless network device may need a restricted driver in
1749+In some cases, the wireless network device may need a restricted driver in
1750 order to operate. The best way to check this is to open the application named
1751-<application>Jockey</application>. To open <application>Jockey</application>, go
1752-to &menujockey;. If the wireless network device requires a restricted driver,
1753-<application>Jockey</application> will provide that information and assist with
1754-selecting, installing and activating the proper driver. When this step is
1755-completed, wireless connections can be configured. The machine must be
1756+<application>Jockey</application>. To open <application>Jockey</application>,
1757+go to &menujockey;. If the wireless network device requires a restricted
1758+driver, <application>Jockey</application> will provide that information and
1759+assist with selecting, installing, and activating the proper driver. When this
1760+step is completed, wireless connections can be configured. The machine must be
1761 rebooted before the newly installed, restricted driver will make the wireless
1762 device work.
1763 </para>
1764@@ -115,27 +118,27 @@
1765 <step>
1766 <para>
1767 <mousebutton>Click</mousebutton> the <guiicon>NetworkManager</guiicon> in
1768-the System Tray area and select <guimenuitem>Manage
1769+the System Tray area and select <guimenuitem>Manage
1770 Connections...</guimenuitem>.
1771 </para>
1772 </step>
1773 <step>
1774 <para>
1775-If a connection has been made previously to the selected network, connect to that
1776-network by clicking on it in the <guilabel>Wireless</guilabel> tab. If
1777-no connection has been made to the desired network previously, continue with the
1778-following procedure:
1779+If a connection has been made previously to the selected network, connect to
1780+that network by <mousebutton>clicking</mousebutton> on it in the
1781+<guilabel>Wireless</guilabel> tab. If no connection has been made to the
1782+desired network previously, continue with the following procedure:
1783 </para>
1784 </step>
1785 <step>
1786 <para>
1787-Click the <guibutton>Add...</guibutton> button.
1788+<mousebutton>Click</mousebutton> the <guibutton>Add...</guibutton> button.
1789 </para>
1790 </step>
1791 <step>
1792 <para>
1793 Enter the <acronym>SSID</acronym> of the new network. It can be entered
1794-manually if known. If not, press the <guibutton>Scan</guibutton> button to
1795+manually, if known. If not, press the <guibutton>Scan</guibutton> button to
1796 search for the network.
1797 </para>
1798 </step>
1799@@ -161,8 +164,8 @@
1800 <sect1 id="mobile">
1801 <title>Mobile Broadband</title>
1802 <para>
1803-<emphasis>Mobile Broadband</emphasis> means any high speed Internet connection
1804-that is provided by an external device such as a <acronym>3G</acronym>
1805+<emphasis>Mobile Broadband</emphasis> means any high speed internet connection
1806+that is provided by an external device, such as a <acronym>3G</acronym>
1807 <acronym>USB</acronym> stick or mobile phone with built-in
1808 <acronym>HSPA</acronym>, <acronym>UMTS</acronym>, or <acronym>GPRS</acronym>
1809 data connection. Some laptops have been offered recently with mobile broadband
1810@@ -192,7 +195,7 @@
1811 </step>
1812 <step>
1813 <para>
1814-The <guilabel>New Mobile Broadband Connection</guilabel> Wizard will be
1815+The <guilabel>New Mobile Broadband Connection</guilabel> wizard will be
1816 displayed. Enter the device and carrier information.
1817 </para>
1818 </step>
1819@@ -203,9 +206,9 @@
1820 <sect1 id="vpn">
1821 <title>Virtual Private Networks (<acronym>VPN</acronym>)</title>
1822 <para>
1823-There are three types of Virtual Private Networks (<acronym>VPN</acronym>) that
1824-are currently supported by <application>NetworkManager</application>. It is
1825-important to know the type of <acronym>VPN</acronym> network in order to
1826+There are three types of Virtual Private Networks (<acronym>VPN</acronym>)
1827+which are currently supported by <application>NetworkManager</application>. It
1828+is important to know the type of <acronym>VPN</acronym> network in order to
1829 connect to it.
1830 </para>
1831 <procedure><title>Connecting to a VPN</title>
1832@@ -253,12 +256,12 @@
1833 </step>
1834 <step>
1835 <para>
1836-Click the <guilabel>DSL</guilabel> tab.
1837+<mousebutton>Click</mousebutton> the <guilabel>DSL</guilabel> tab.
1838 </para>
1839 </step>
1840 <step>
1841 <para>
1842-Click the <guilabel>Add...</guilabel> button.
1843+<mousebutton>Click</mousebutton> the <guilabel>Add...</guilabel> button.
1844 </para>
1845 </step>
1846 </procedure>
1847
1848=== modified file 'docs/security/C/security.xml'
1849--- docs/security/C/security.xml 2010-03-26 21:38:03 +0000
1850+++ docs/security/C/security.xml 2012-03-22 18:52:20 +0000
1851@@ -70,24 +70,25 @@
1852 Keyboard shortcuts can be changed in <application>System Settings</application>
1853 under the <guilabel>Keyboard &amp; Mouse</guilabel>. To access these settings,
1854 go to Menu Bread Crumbs. Select <guilabel>Global Keyboard Shortcuts</guilabel>,
1855-in the KDE component dropdown, select <guilabel>Run Command Interface</guilabel>
1856-and locate <guilabel>Lock Session</guilabel>.
1857+in the <trademark>KDE</trademark> component drop-down, select <guilabel>Run
1858+Command Interface</guilabel>, and locate <guilabel>Lock Session</guilabel>.
1859 </para>
1860 </note>
1861
1862 <note><title>Adding a lock screen button to the panel</title>
1863 <para>
1864 A <guibutton>Lock Screen</guibutton> button can be added to the
1865-<application>Panel</application> for quick and easy screen locking. Right-click
1866-the <application>Panel</application>, select <guibutton>Add
1867-Widgets...</guibutton>, select <guibutton>Lock/Logout</guibutton> and drag it
1868-to the proper location on the Panel.
1869+<application>Panel</application> for quick and easy screen locking.
1870+<mousebutton>Right-click</mousebutton> the <application>Panel</application>,
1871+select <guibutton>Add Widgets...</guibutton>, select
1872+<guibutton>Lock/Logout</guibutton>, and drag it to the proper location on the
1873+<application>Panel</application>.
1874 </para>
1875 </note>
1876
1877 <para>
1878 To unlock the screen, move the mouse or press a key. Enter the password, and
1879-either press the <keycap>Return</keycap> key or press the
1880+either press the <keycap>Return</keycap> key or press the
1881 <guibutton>Unlock</guibutton> button.
1882 </para>
1883 <para>
1884@@ -105,17 +106,17 @@
1885
1886 <para>
1887 <application>Guarddog</application> is the firewall of choice for &kubuntu;.
1888-Please review the <ulink type="help"
1889-url="help:/kubuntu/network/">Networking</ulink>
1890-documentation and locate the <application>Guarddog</application> section.
1891+Please review the <ulink type="help"
1892+url="help:/kubuntu/network/">Networking</ulink> documentation and locate the
1893+<application>Guarddog</application> section.
1894 </para>
1895 </sect1>
1896
1897 <sect1 id="keep-safe-avoid-internet-crime" status="complete">
1898 <title>Avoid Internet nuisances and crime</title>
1899
1900-<para>From time to time, email messages carry viruses or links to fraudulent
1901-websites. It is important to learn how to deal with these messages, in order to
1902+<para>From time to time email messages carry viruses or links to fraudulent
1903+web sites. It is important to learn how to deal with these messages in order to
1904 prevent the computer or personal information from being compromised or misused.
1905 </para>
1906
1907@@ -131,20 +132,20 @@
1908 <itemizedlist>
1909 <listitem>
1910 <para>
1911-Spam (junk) email with offers for unwanted services and products
1912-</para>
1913-</listitem>
1914-
1915-<listitem>
1916-<para>
1917-Scam emails asking for help in exchange for money
1918-</para>
1919-</listitem>
1920-
1921-<listitem>
1922-<para>
1923-Phishing email that appears to be from a bank or other online service, asking
1924-for personal and financial details, or passwords
1925+Spam (junk) email with offers for unwanted services and products.
1926+</para>
1927+</listitem>
1928+
1929+<listitem>
1930+<para>
1931+Scam emails asking for help in exchange for money.
1932+</para>
1933+</listitem>
1934+
1935+<listitem>
1936+<para>
1937+Phishing email, that appears to be from a bank or other online service, asking
1938+for personal and financial details or passwords.
1939 </para>
1940 </listitem>
1941 </itemizedlist>
1942@@ -159,7 +160,7 @@
1943
1944 <listitem>
1945 <para>
1946-Never click on links in emails that lead to websites asking for passwords or
1947+Never click on links in emails that lead to web sites asking for passwords or
1948 similar information. It is possible for the text of the link to show one
1949 address, but clicking on the link actually connects to a different (possibly
1950 dangerous) address. Instead of clicking a potentially misleading link, type the
1951@@ -169,22 +170,22 @@
1952
1953 <listitem>
1954 <para>
1955-When visiting a website that asks for financial information, ensure that it is
1956-secure. <application>Konqueror</application> and
1957+When visiting a web site that asks for financial information, ensure that it is
1958+secure. <application>Konqueror</application> and
1959 <application>Firefox</application> are two browsers commonly used in &kubuntu;.
1960-Both have two areas that indicate if the current page is secure. On secure
1961-webpages, the address bar will have a yellow background and a lock
1962-symbol to the right of the address. The second area is the status bar located at
1963-the bottom right of the browser window. If the page is secure, a lock icon will
1964-appear in this area. Clicking on either of the lock symbols will produce a
1965-dialog that explains the type of licensing and security for that page.
1966+Both have two areas that indicate if the current page is secure. On secure web
1967+pages, the address bar will have a yellow background and a lock symbol to the
1968+right of the address. The second area is the status bar located at the bottom
1969+right of the browser window. If the page is secure, a lock icon will appear in
1970+this area. Clicking on either of the lock symbols will produce a dialog that
1971+explains the type of licensing and security for the page.
1972 </para>
1973 </listitem>
1974
1975 <listitem>
1976 <para>
1977 Only download and run software from trusted sources. By default, software can
1978-only be downloaded directly from Ubuntu.
1979+only be downloaded directly from &ubuntu;.
1980 </para>
1981 </listitem>
1982 </itemizedlist>
1983@@ -196,8 +197,8 @@
1984 <para>
1985 Occasionally users lose computer information. There are many possible causes
1986 for such unforeseen <emphasis>data loss</emphasis>. The problem could be
1987-anything from a power loss or equipment failure to accidentally deleting a file.
1988-With regular backup copies, if a problem should occur, it may be possible
1989+anything from a power loss or equipment failure to accidentally deleting a
1990+file. With regular backup copies, if a problem should occur, it may be possible
1991 to retrieve important files. Users are strongly encouraged to make backups.
1992 </para>
1993 <para>
1994@@ -206,9 +207,11 @@
1995 attached to the computer. Options include:
1996 </para>
1997 <itemizedlist>
1998-<listitem><para>Writable CDs and DVDs</para></listitem>
1999-<listitem><para>External hard disks and flash memory devices</para></listitem>
2000-<listitem><para>Another computer on the network</para></listitem>
2001+<listitem><para>Writable <acronym>CD</acronym>s and <acronym>DVD</acronym>s.
2002+</para></listitem>
2003+<listitem><para>External hard disks.</para></listitem>
2004+<listitem><para>Flash memory devices.</para></listitem>
2005+<listitem><para>Another computer on the network.</para></listitem>
2006 </itemizedlist>
2007 <para>
2008 A simple way of backing up your files is to copy them manually to a safe
2009@@ -217,7 +220,7 @@
2010 </para>
2011 <para>
2012 Another backup method is <application>Keep</application>, an automated &kubuntu;
2013-backup solution, preferred by many &kubuntu; veterans. To install the
2014+backup solution preferred by many &kubuntu; veterans. To install the
2015 <application>Keep</application> package, please refer to the <ulink
2016 type="help" url="help:/kubuntu/manage-software/">Adding Applications</ulink>
2017 document for help on installing applications. Once installed,
2018
2019=== modified file 'docs/sharing/C/sharing.xml'
2020--- docs/sharing/C/sharing.xml 2010-03-26 21:38:03 +0000
2021+++ docs/sharing/C/sharing.xml 2012-03-22 18:52:20 +0000
2022@@ -13,7 +13,8 @@
2023 &legalnotice;
2024 <abstract>
2025 <para>
2026-This document explains how to share files between &kubuntu; and Windows.
2027+This document explains how to share files between &kubuntu; and
2028+<trademark class='registered'>Windows</trademark>.
2029 </para>
2030 </abstract>
2031 </articleinfo>
2032@@ -25,17 +26,20 @@
2033 Computer networks are often comprised of diverse systems. While operating a
2034 network made up entirely of &kubuntu; desktop and server computers would
2035 certainly be fun, some network environments will consist of &kubuntu; and
2036-<trademark class='registered'>Microsoft</trademark>
2037-<trademark class='registered'>Windows</trademark> systems working together. This
2038-section of the &kubuntu; &sg-title; introduces principles and tools used for
2039-configuring &kubuntu; servers to share network resources with Windows computers.
2040+<trademark class='registered'>Microsoft</trademark> <trademark
2041+class='registered'>Windows</trademark> systems working together. This section
2042+of the &kubuntu; &sg-title; introduces principles and tools used for
2043+configuring &kubuntu; servers to share network resources with <trademark
2044+class='registered'>Windows</trademark> computers.
2045 </para>
2046
2047 <para>
2048-Successfully networking a &kubuntu; system with Windows clients involves
2049-providing and integrating services common to Windows environments. These
2050-services support sharing data and information about the computers and users
2051-on the network, and may be classified into three major categories:
2052+Successfully networking a &kubuntu; system with <trademark
2053+class='registered'>Windows</trademark> clients involves providing and
2054+integrating services common to <trademark
2055+class='registered'>Windows</trademark> environments. These services support
2056+sharing data and information about the computers and users on the network, and
2057+may be classified into three major categories:
2058 </para>
2059
2060 <itemizedlist>
2061@@ -48,35 +52,39 @@
2062 </listitem>
2063 <listitem>
2064 <para>
2065-<emphasis role="bold">Directory Services</emphasis>. Vital information is shared
2066-about the computers and users of the network with such technologies as the
2067-Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and Microsoft
2068-<trademark class='registered'>Active Directory</trademark>.
2069+<emphasis>Directory Services</emphasis>. Vital information is
2070+shared about the computers and users of the network with such technologies as
2071+the Lightweight Directory Access Protocol (<acronym>LDAP</acronym>) and
2072+<trademark class='registered'>Microsoft</trademark> <trademark
2073+class='registered'>Active Directory</trademark>.
2074 </para>
2075 </listitem>
2076 <listitem>
2077 <para>
2078-<emphasis role="bold">Authentication and Access</emphasis>. It is
2079-necessary to be able to establish the identity of a computer or user to
2080-determine the information the computer or user is authorized to access.
2081-Authentication and access use principles and technologies such as file
2082-permissions, group policies, and the Kerberos authentication service.
2083+<emphasis>Authentication and Access</emphasis>. It is necessary to be able to
2084+establish the identity of a computer or user to determine the information the
2085+computer or user is authorized to access. Authentication and access use
2086+principles and technologies such as file permissions, group policies, and the
2087+<trademark>Kerberos</trademark> authentication service.
2088 </para>
2089 </listitem>
2090 </itemizedlist>
2091
2092 <para>
2093-A &kubuntu; system can provide all such capabilities for Windows clients and
2094-enable sharing network resources with them. One of the principal pieces of
2095-software included in a &kubuntu; system for Windows networking is the Samba
2096-suite of <acronym>SMB</acronym> server applications and tools.
2097+A &kubuntu; system can provide all such capabilities for <trademark
2098+class='registered'>Windows</trademark> clients and enable sharing network
2099+resources with them. One of the principal pieces of software included in a
2100+&kubuntu; system for <trademark class='registered'>Windows</trademark>
2101+networking is the <application>Samba</application> suite of
2102+<acronym>SMB</acronym> server applications and tools.
2103 </para>
2104
2105 <para>
2106-This section of the &kubuntu; &sg-title; will introduce some of the ways Samba
2107-is commonly used, and how to install and configure the necessary packages.
2108-Additional detailed documentation and information on Samba can be found
2109-on the <ulink url="http://www.samba.org">Samba website</ulink>.
2110+This section of the &kubuntu; &sg-title; will introduce some of the ways
2111+<application>Samba</application> is commonly used, and how to install and
2112+configure the necessary packages. Additional detailed documentation and
2113+information on <application>Samba</application> can be found on the <ulink
2114+url="http://www.samba.org"><application>Samba</application> website</ulink>.
2115 </para>
2116 </sect1>
2117
2118@@ -84,22 +92,25 @@
2119 <title>Samba File Server</title>
2120
2121 <para>
2122-One of the most common ways to network &kubuntu; and Windows computers is to
2123-configure Samba as a File Server. This section covers setting up a
2124-<application>Samba</application> server to share files with Windows clients.
2125+One of the most common ways to network &kubuntu; and <trademark
2126+class='registered'>Windows</trademark> computers is to configure
2127+<application>Samba</application> as a file server. This section covers setting
2128+up a <application>Samba</application> server to share files with <trademark
2129+class='registered'>Windows</trademark> clients.
2130 </para>
2131
2132 <para>
2133 The server will be configured to share files with any client on the network
2134-without prompting for a password. If the environment requires stricter Access
2135-Controls, see <xref linkend="samba-fileprint-security"/>
2136+without prompting for a password. If the environment requires stricter access
2137+controls, see <xref linkend="samba-fileprint-security"/>.
2138 </para>
2139
2140 <sect2 id="samba-fileserver-installation">
2141 <title>Installation</title>
2142
2143 <para>
2144-The first step is to install the <application>samba</application> package. From a terminal prompt enter:
2145+The first step is to install the <application>samba</application> package. From
2146+a terminal prompt, enter:
2147 </para>
2148
2149 <screen>
2150@@ -107,7 +118,8 @@
2151 </screen>
2152
2153 <para>
2154-That's all there is to it. Samba is ready to be configured for file sharing.
2155+That's all there is to it. <application>Samba</application> is ready to be
2156+configured for file sharing.
2157 </para>
2158
2159 </sect2>
2160@@ -115,16 +127,18 @@
2161 <title>Configuration</title>
2162
2163 <para>
2164-The main Samba configuration file is located in
2165-<filename>/etc/samba/smb.conf</filename>. The default configuration file has a
2166+The main <application>Samba</application> configuration file is located in
2167+<filename>/etc/samba/smb.conf</filename>. The default configuration file has a
2168 significant number of comments in order to document various configuration
2169-directives.
2170+directives.
2171 </para>
2172 <note>
2173 <para>
2174-Not all the available options are included in the default configuration file. See the <filename>smb.conf</filename>
2175-<application>man</application> page or the
2176-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink> for more details.
2177+Not all of the available options are included in the default configuration
2178+file. See the <filename>smb.conf</filename> <application>man</application> page
2179+or the <ulink
2180+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
2181+<application>Samba</application> HOWTO Collection</ulink> for more details.
2182 </para>
2183 </note>
2184
2185@@ -144,8 +158,8 @@
2186
2187 <para>
2188 The <emphasis>security</emphasis> parameter is farther down in the [global]
2189-section, and is commented out by default.
2190-Change <emphasis>EXAMPLE</emphasis> to match the actual environment.
2191+section, and is commented out by default. Change <emphasis>EXAMPLE</emphasis>
2192+to match the actual environment.
2193 </para>
2194
2195 </step>
2196@@ -169,7 +183,7 @@
2197 <itemizedlist>
2198 <listitem>
2199 <para>
2200-<emphasis>comment:</emphasis> a short description of the share. Adjust to fit
2201+<emphasis>comment:</emphasis> a short description of the share. Adjust to fit
2202 as appropriate.
2203 </para>
2204 </listitem>
2205@@ -180,17 +194,19 @@
2206 <para>
2207 This example uses <filename>/srv/samba/sharename</filename> because, according
2208 to the <emphasis>Filesystem Hierarchy Standard (FHS)</emphasis>,
2209-<ulink url="http://www.pathname.com/fhs/pub/fhs-2.3.
2210-html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink>
2211-is where site-specific data should be served. Technically Samba shares can be
2212-placed anywhere on the filesystem as long as the permissions are correct, but
2213-adhering to standards is recommended.
2214+<ulink
2215+url="http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">
2216+/srv</ulink> is where site-specific data should be served. Technically,
2217+<application>Samba</application> shares can be placed anywhere on the
2218+filesystem as long as the permissions are correct, but adhering to standards is
2219+recommended.
2220 </para>
2221 </listitem>
2222 <listitem>
2223 <para>
2224-<emphasis>browsable:</emphasis> enables Windows clients to browse the shared
2225-directory using <application>Windows Explorer</application>.
2226+<emphasis>browsable:</emphasis> enables <trademark
2227+class='registered'>Windows</trademark> clients to browse the shared directory
2228+using <application>Windows Explorer</application>.
2229 </para>
2230 </listitem>
2231 <listitem>
2232@@ -201,13 +217,16 @@
2233 </listitem>
2234 <listitem>
2235 <para>
2236-<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.
2237+<emphasis>read only:</emphasis> determines if the share is read only or if
2238+write privileges are granted. Write privileges are allowed only when the value
2239+is <emphasis>no</emphasis>, as is seen in this example. If the value is
2240+<emphasis>yes</emphasis>, then access to the share is read only.
2241 </para>
2242 </listitem>
2243 <listitem>
2244 <para>
2245-<emphasis>create mask:</emphasis> determines the permissions new files will have
2246-when created.
2247+<emphasis>create mask:</emphasis> determines the permissions new files will
2248+have when created.
2249 </para>
2250 </listitem>
2251 </itemizedlist>
2252@@ -217,7 +236,7 @@
2253
2254 <para>
2255 Now that <application>Samba</application> is configured, the directory needs to
2256-be created and the permissions changed. From a terminal enter:
2257+be created and the permissions changed. From a terminal, enter:
2258 </para>
2259
2260 <screen>
2261@@ -227,8 +246,9 @@
2262
2263 <note>
2264 <para>
2265-The <emphasis>-p</emphasis> switch tells mkdir to create the entire directory
2266-tree if it doesn't exist. Change the share name to fit the environment.
2267+The <emphasis>-p</emphasis> switch tells <command>mkdir</command> to create the
2268+entire directory tree if it doesn't exist. Change the share name to fit the
2269+environment.
2270 </para>
2271 </note>
2272
2273@@ -236,7 +256,8 @@
2274 <step>
2275
2276 <para>
2277-Finally, restart the <application>samba</application> services to enable the new configuration:
2278+Finally, restart the <application>samba</application> services to enable the
2279+new configuration:
2280 </para>
2281
2282 <screen>
2283@@ -248,21 +269,23 @@
2284
2285 <warning>
2286 <para>
2287-The above configuration gives all access to any client on the local network. For
2288-a more secure configuration, see <xref linkend="samba-fileprint-security"/>.
2289+The above configuration gives all access to any client on the local network.
2290+For a more secure configuration, see <xref
2291+linkend="samba-fileprint-security"/>.
2292 </para>
2293 </warning>
2294
2295 <para>
2296-From a Windows client, it should now be possible to browse to the &kubuntu; file
2297-server and see the shared directory. To check that everything is working, try
2298-creating a directory from Windows.
2299+From a <trademark class='registered'>Windows</trademark> client, it should now
2300+be possible to browse to the &kubuntu; file server and see the shared
2301+directory. To check that everything is working, try creating a directory from
2302+<trademark class='registered'>Windows</trademark>.
2303 </para>
2304
2305 <para>
2306 To create additional shares, simply create new <emphasis>[dir]</emphasis>
2307 sections in <filename>/etc/samba/smb.conf</filename>, and restart
2308-<emphasis>Samba</emphasis>. Make sure that the directory to be shared actually
2309+<emphasis>Samba</emphasis>. Make sure that the directory to be shared actually
2310 exists and that the permissions are correct.
2311 </para>
2312 </sect2>
2313@@ -273,13 +296,15 @@
2314 <listitem>
2315 <para>
2316 For in depth Samba configurations see the
2317-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
2318+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba
2319+HOWTO Collection</ulink>
2320 </para>
2321 </listitem>
2322 <listitem>
2323 <para>
2324-The guide is also available in
2325-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
2326+The guide is also available in <ulink
2327+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed
2328+format</ulink>.
2329 </para>
2330 </listitem>
2331 <listitem>
2332@@ -300,45 +325,50 @@
2333 <title>Samba Security Modes</title>
2334
2335 <para>
2336-There are two security levels available to the Common Internet Filesystem (CIFS)
2337-network protocol <emphasis>user-level</emphasis> and
2338-<emphasis>share-level</emphasis>. Samba's <emphasis>security mode</emphasis>
2339-implementation allows more flexibility, providing four ways of implementing
2340-user-level security and one way to implement share-level:
2341+There are two security levels available to the Common Internet Filesystem
2342+(<acronym>CIFS</acronym>) network protocol <emphasis>user-level</emphasis> and
2343+<emphasis>share-level</emphasis>. <application>Samba</application>'s
2344+<emphasis>security mode</emphasis> implementation allows more flexibility,
2345+providing four ways of implementing user-level security and one way to
2346+implement share-level:
2347 </para>
2348
2349 <itemizedlist>
2350 <listitem>
2351 <para>
2352 <emphasis>security = user:</emphasis> requires clients to supply a username and
2353-password to connect to shares. Samba user accounts are separate from system
2354-accounts, but the <application>libpam-smbpass</application> package will sync
2355-system users and passwords with the Samba user database.
2356-</para>
2357-</listitem>
2358-<listitem>
2359-<para>
2360-<emphasis>security = domain:</emphasis> this mode allows the Samba server to
2361-appear to Windows clients as a Primary Domain Controller (PDC), Backup Domain
2362-Controller (BDC), or a Domain Member Server (DMS). See
2363-<xref linkend="samba-dc"/> for further information.
2364-</para>
2365-</listitem>
2366-<listitem>
2367-<para>
2368-<emphasis>security = ADS:</emphasis> allows the Samba server to join an Active
2369-Directory domain as a native member. See <xref linkend="samba-ad-integration"/>
2370-for details.
2371-</para>
2372-</listitem>
2373-<listitem>
2374-<para>
2375-<emphasis>security = server:</emphasis> this mode is left over from before Samba
2376-could become a member server, and, due to some security issues, should not be
2377-used. See the <ulink
2378+password to connect to shares. <application>Samba</application> user accounts
2379+are separate from system accounts, but the
2380+<application>libpam-smbpass</application> package will sync system users and
2381+passwords with the <application>Samba</application> user database.
2382+</para>
2383+</listitem>
2384+<listitem>
2385+<para>
2386+<emphasis>security = domain:</emphasis> this mode allows the
2387+<application>Samba</application> server to appear to <trademark
2388+class='registered'>Windows</trademark> clients as a Primary Domain Controller
2389+(<acronym>PDC</acronym>), Backup Domain Controller (<acronym>BDC</acronym>), or
2390+a Domain Member Server (<acronym>DMS</acronym>). See <xref linkend="samba-dc"/>
2391+for further information.
2392+</para>
2393+</listitem>
2394+<listitem>
2395+<para>
2396+<emphasis>security = ADS:</emphasis> allows the
2397+<application>Samba</application> server to join an <trademark
2398+class='registered'>Active Directory</trademark> domain as a native member. See
2399+<xref linkend="samba-ad-integration"/> for details.
2400+</para>
2401+</listitem>
2402+<listitem>
2403+<para>
2404+<emphasis>security = server:</emphasis> this mode is left over from before
2405+<application>Samba</application> could become a member server, and, due to some
2406+security issues, should not be used. See the <ulink
2407 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/ServerType.
2408-html#id349531">Server Security</ulink> section of the Samba guide for more
2409-details.
2410+html#id349531">Server Security</ulink> section of the
2411+<application>Samba</application> guide for more details.
2412 </para>
2413 </listitem>
2414 <listitem>
2415@@ -350,8 +380,8 @@
2416 </itemizedlist>
2417
2418 <para>
2419-The preferred security mode depends on the environment and what the Samba
2420-server needs to accomplish.
2421+The preferred security mode depends on the environment and what the
2422+<application>Samba</application> server needs to accomplish.
2423 </para>
2424
2425 </sect2>
2426@@ -359,15 +389,16 @@
2427 <title>Security = User</title>
2428
2429 <para>
2430-This section will reconfigure the Samba file and print server, from <xref
2431-linkend="samba-fileserver"/> and the
2432-<ulink type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to
2433-require authentication.
2434+This section will reconfigure the <application>Samba</application> file and
2435+print server, from <xref linkend="samba-fileserver"/> and the <ulink
2436+type="help" url="help:/kubuntu/printing/"> Print Server</ulink>, to require
2437+authentication.
2438 </para>
2439
2440 <para>
2441-First, install the <application>libpam-smbpass</application> package which will
2442-sync the system users to the Samba user database:
2443+First, install the <application>libpam-smbpass</application> package, which
2444+will sync the system users to the <application>Samba</application> user
2445+database:
2446 </para>
2447
2448 <screen>
2449@@ -376,8 +407,9 @@
2450
2451 <note>
2452 <para>
2453-If the <emphasis>Samba Server</emphasis> task was chosen during installation,
2454-<application>libpam-smbpass</application> is already installed.
2455+If the <emphasis><application>Samba</application> Server</emphasis> task was
2456+chosen during installation, <application>libpam-smbpass</application> is
2457+already installed.
2458 </para>
2459 </note>
2460
2461@@ -391,7 +423,8 @@
2462 </programlisting>
2463
2464 <para>
2465-Finally, restart Samba for the new settings to take effect:
2466+Finally, restart <application>Samba</application> for the new settings to take
2467+effect:
2468 </para>
2469
2470 <screen>
2471@@ -400,14 +433,14 @@
2472
2473 <para>
2474 Now when connecting to the shared directories or printers, there will be a
2475-prompt for a username and password.
2476+prompt for a username and password.
2477 </para>
2478
2479 <note>
2480 <para>
2481-To map a network drive to the share, <quote>Reconnect at Logon</quote> should be
2482-checked, which will require the username and password to be entered just once,
2483-at least until the password changes.
2484+To map a network drive to the share, <quote>Reconnect at Logon</quote> should
2485+be checked, which will require the username and password to be entered just
2486+once &mdash; at least until the password changes.
2487 </para>
2488 </note>
2489
2490@@ -416,47 +449,45 @@
2491 <title>Share Security</title>
2492
2493 <para>
2494-There are several options available to increase the security for each individual
2495-shared directory. Using the <emphasis>[share]</emphasis> example, this section
2496-will cover some common options.
2497+There are several options available to increase the security for each shared
2498+directory. Using the <emphasis>[share]</emphasis> example, this section will
2499+cover some common options.
2500 </para>
2501
2502 <sect3 id="windows-networking-groups">
2503 <title>Groups</title>
2504
2505 <para>
2506-Groups define a collection of computers or users which have a common level of
2507+Groups define a collection of computers or users who have a common level of
2508 access to particular network resources and offer a level of granularity in
2509-controlling access to such resources. For example, if a group
2510-<emphasis role="italic">qa</emphasis> is defined and contains the users
2511-<emphasis role="italic">freda</emphasis>, <emphasis
2512-role="italic">danika</emphasis>, and <emphasis role="italic">rob</emphasis> and
2513-a second group <emphasis role="italic">support</emphasis> is defined and
2514-consists of users <emphasis role="italic">danika</emphasis>,
2515-<emphasis role="italic">jeremy</emphasis>, and <emphasis
2516-role="italic">vincent</emphasis>, then certain network resources configured to
2517-allow access by the <emphasis role="italic">qa</emphasis> group will
2518-subsequently enable access by freda, danika, and rob, but not jeremy or
2519-vincent. Since the user <emphasis role="italic">danika</emphasis>
2520-belongs to both the <emphasis role="italic">qa</emphasis> and <emphasis
2521+controlling access to such resources. For example, if a group <emphasis
2522+role="italic">qa</emphasis> is defined and contains the users <emphasis
2523+role="italic">freda</emphasis>, <emphasis role="italic">danika</emphasis>, and
2524+<emphasis role="italic">rob</emphasis>, and a second group <emphasis
2525+role="italic">support</emphasis> is defined and consists of users <emphasis
2526+role="italic">danika</emphasis>, <emphasis role="italic">jeremy</emphasis>, and
2527+<emphasis role="italic">vincent</emphasis>, then certain network resources
2528+configured to allow access by the <emphasis role="italic">qa</emphasis> group
2529+will subsequently enable access by freda, danika, and rob, but not jeremy or
2530+vincent. Since the user <emphasis role="italic">danika</emphasis> belongs to
2531+both the <emphasis role="italic">qa</emphasis> and <emphasis
2532 role="italic">support</emphasis> groups, she will be able to access resources
2533 configured for access by both groups, whereas all other users will have only
2534 access to resources explicitly allowing the group they are part of.
2535 </para>
2536
2537-
2538 <para>
2539-By default Samba looks for the local system groups defined in
2540-<filename>/etc/group</filename> to determine which users belong to which
2541-groups. For more information on adding and removing users from groups see
2542-<ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
2543+By default, <application>Samba</application> looks for the local system groups
2544+defined in <filename>/etc/group</filename> to determine which users belong to
2545+which groups. For more information on adding and removing users from groups,
2546+see <ulink type="help" url="help:/kubuntu/basics/"> Basics</ulink>.
2547 </para>
2548
2549 <para>
2550-When defining groups in the Samba configuration file,
2551-<filename>/etc/samba/smb.conf</filename>, the recognized syntax
2552-is to preface the group name with an "@" symbol. For example, to define a group
2553-named <emphasis role="italic">sysadmin</emphasis> in a certain section of the
2554+When defining groups in the <application>Samba</application> configuration
2555+file, <filename>/etc/samba/smb.conf</filename>, the recognized syntax is to
2556+preface the group name with an "@" symbol. For example, to define a group named
2557+<emphasis role="italic">sysadmin</emphasis> in a certain section of the
2558 <filename>/etc/samba/smb.conf</filename>, the group name would be entered as
2559 <emphasis role="bold">@sysadmin</emphasis>.
2560 </para>
2561@@ -466,19 +497,19 @@
2562 <title>File Permissions</title>
2563
2564 <para>
2565-File Permissions define the explicit rights a computer or user has to a
2566-particular directory, file, or set of files. Such permissions may be defined by
2567+File permissions define the explicit rights a computer or user has to a
2568+particular directory, file, or set of files. Such permissions may be defined by
2569 editing the <filename>/etc/samba/smb.conf</filename> file and specifying the
2570 explicit permissions of a defined file share.
2571 </para>
2572
2573 <para>
2574-For example, for a defined Samba share called <emphasis>share</emphasis> and
2575-the need to give <emphasis role="italic">read-only</emphasis> permissions to the
2576-group of users known as <emphasis role="italic">qa</emphasis>, while allowing
2577-write permissions to the share by the group called
2578-<emphasis role="italic">sysadmin</emphasis> and the user named <emphasis
2579-role="italic">vincent</emphasis>, then the
2580+For example, for a defined <application>Samba</application> share called
2581+<emphasis>share</emphasis> and the need to give <emphasis
2582+role="italic">read-only</emphasis> permissions to the group of users known as
2583+<emphasis role="italic">qa</emphasis>, while allowing write permissions to the
2584+share by the group called <emphasis role="italic">sysadmin</emphasis> and the
2585+user named <emphasis role="italic">vincent</emphasis>, then the
2586 <filename>/etc/samba/smb.conf</filename> file could be edited to add the
2587 following entries under the <emphasis>[share]</emphasis> entry:
2588 </para>
2589@@ -489,11 +520,11 @@
2590 </programlisting>
2591
2592 <para>
2593-Another possible Samba permission is to declare
2594-<emphasis>administrative</emphasis> permissions to a particular shared resource.
2595-Users having administrative permissions may read, write, or modify any
2596-information contained in the resource where the user has been given explicit
2597-administrative permissions.
2598+Another possible <application>Samba</application> permission is to declare
2599+<emphasis>administrative</emphasis> permissions to a particular shared
2600+resource. Users having administrative permissions may read, write, or modify
2601+any information contained in the resource where they have been given
2602+explicit administrative permissions.
2603 </para>
2604
2605 <para>
2606@@ -508,7 +539,8 @@
2607 </programlisting>
2608
2609 <para>
2610-After editing <filename>/etc/samba/smb.conf</filename>, restart Samba for the changes to take effect:
2611+After editing <filename>/etc/samba/smb.conf</filename>, restart
2612+<application>Samba</application> for the changes to take effect:
2613 </para>
2614
2615 <screen>
2616@@ -518,21 +550,25 @@
2617 <note>
2618 <para>
2619 For the <emphasis>read list</emphasis> and <emphasis>write list</emphasis> to
2620-work the Samba security mode must <emphasis>not</emphasis> be set to <emphasis
2621-role="italic">security = share</emphasis>
2622+work, the <application>Samba</application> security mode must
2623+<emphasis>not</emphasis> be set to <emphasis role="italic">security =
2624+share</emphasis>.
2625 </para>
2626 </note>
2627
2628 <para>
2629-Now that Samba has been configured to limit which groups have access to the
2630-shared directory, the filesystem permissions need to be updated.
2631+Now that <application>Samba</application> has been configured to limit which
2632+groups have access to the shared directory, the filesystem permissions need to
2633+be updated.
2634 </para>
2635
2636 <para>
2637-Traditional Linux file permissions do not map well to Windows NT Access Control
2638-Lists (ACLs). Fortunately POSIX ACLs are available on &kubuntu; servers
2639-providing more fine grained control. For example, to enable ACLs on
2640-<filename>/srv</filename> an EXT3 filesystem, edit
2641+Traditional <trademark>Linux</trademark> file permissions do not map well to
2642+<trademark class='registered'>Windows NT Access Control Lists</trademark>
2643+(<acronym>ACL</acronym>s). Fortunately <trademark>POSIX</trademark>
2644+<acronym>ACL</acronym>s are available on &kubuntu; servers providing more
2645+fine-grained control. For example, to enable <acronym>ACL</acronym>s on
2646+<filename>/srv</filename> an <trademark>EXT3</trademark> filesystem, edit
2647 <filename>/etc/fstab</filename> adding the <emphasis>acl</emphasis> option:
2648 </para>
2649
2650@@ -551,18 +587,20 @@
2651
2652 <note>
2653 <para>
2654-The above example assumes <filename>/srv</filename> on a separate partition. If <filename>/srv</filename>,
2655-or wherever the share path is configured, is part of the <filename>/</filename>
2656-partition, a reboot may be required.
2657+The above example assumes <filename>/srv</filename> is on a separate partition.
2658+If <filename>/srv</filename> &mdash; or wherever the share path is configured
2659+&mdash; is part of the <filename>/</filename> partition, a reboot may be
2660+required.
2661 </para>
2662 </note>
2663
2664 <para>
2665-To match the Samba configuration above, the <emphasis>sysadmin</emphasis> group
2666-will be given read, write, and execute permissions to
2667-<filename>/srv/samba/share</filename>, the <emphasis>qa</emphasis> group will be
2668-given read and execute permissions, and the files will be owned by the username
2669-<emphasis>melissa</emphasis>. Enter the following in a terminal:
2670+To match the <application>Samba</application> configuration above, the
2671+<emphasis>sysadmin</emphasis> group will be given read, write, and execute
2672+permissions to <filename>/srv/samba/share</filename>, the
2673+<emphasis>qa</emphasis> group will be given read and execute permissions, and
2674+the files will be owned by the username <emphasis>melissa</emphasis>. Enter the
2675+following in a terminal:
2676 </para>
2677
2678 <screen>
2679@@ -575,15 +613,16 @@
2680 <para>
2681 The <application>setfacl</application> command above gives
2682 <emphasis>execute</emphasis> permissions to all files in the
2683-<filename>/srv/samba/share</filename> directory, which may or may not be
2684+<filename>/srv/samba/share</filename> directory, which may or may not be
2685 desirable.
2686 </para>
2687 </note>
2688
2689 <para>
2690-A Windows client will show that the new file permissions are implemented. See
2691-the <application>acl</application> and <application>setfacl</application> man
2692-pages for more information on POSIX ACLs.
2693+A <trademark class='registered'>Windows</trademark> client will show that the
2694+new file permissions are implemented. See the <application>acl</application>
2695+and <application>setfacl</application> man pages for more information on
2696+<trademark>POSIX</trademark> <acronym>ACL</acronym>s.
2697 </para>
2698
2699 </sect3>
2700@@ -593,16 +632,19 @@
2701
2702 <para>
2703 &kubuntu; comes with the <application>AppArmor</application> security module,
2704-which provides mandatory access controls. The default AppArmor profile for Samba
2705-will need to be adapted to the proper configuration. For more details on using
2706-AppArmor, please refer to the<ulink
2707-url="https://help.ubuntu.com/community/AppArmor"> wiki</ulink>
2708+which provides mandatory access controls. The default
2709+<application>AppArmor</application> profile for
2710+<application>Samba</application> will need to be adapted to the proper
2711+configuration. For more details on using <application>AppArmor</application>,
2712+please refer to the <ulink url="https://help.ubuntu.com/community/AppArmor">
2713+wiki</ulink>.
2714 </para>
2715
2716 <para>
2717-There are default AppArmor profiles for <filename>/usr/sbin/smbd</filename> and
2718-<filename>/usr/sbin/nmbd</filename>, the Samba daemon binaries, as part of the
2719-<application>apparmor-profiles</application> packages. To install the package,
2720+There are default <application>AppArmor</application> profiles for
2721+<filename>/usr/sbin/smbd</filename> and <filename>/usr/sbin/nmbd</filename>,
2722+the <application>Samba</application> daemon binaries, as part of the
2723+<application>apparmor-profiles</application> packages. To install the package
2724 from a terminal prompt, enter:
2725 </para>
2726
2727@@ -619,10 +661,11 @@
2728 <para>
2729 By default the profiles for <application>smbd</application> and
2730 <application>nmbd</application> are in <emphasis>complain</emphasis> mode,
2731-allowing Samba to work without modifying the profile, and only logging errors.
2732-To place the <application>smbd</application> profile into
2733-<emphasis>enforce</emphasis> mode, and have Samba work as expected, the profile
2734-will need to be modified to reflect any directories that are shared.
2735+allowing <application>Samba</application> to work without modifying the
2736+profile, and only logging errors. To place the <application>smbd</application>
2737+profile into <emphasis>enforce</emphasis> mode and have
2738+<application>Samba</application> work as expected, the profile will need to be
2739+modified to reflect any directories that are shared.
2740 </para>
2741
2742 <para>
2743@@ -636,7 +679,7 @@
2744 </programlisting>
2745
2746 <para>
2747-Now place the profile into <emphasis>enforce</emphasis> and reload it:
2748+Now place the profile into <emphasis>enforce</emphasis> mode and reload it:
2749 </para>
2750
2751 <screen>
2752@@ -648,8 +691,8 @@
2753 It is now possible to read, write, and execute files in the shared directory as
2754 normal, and the <application>smbd</application> binary will have access to only
2755 the configured files and directories. Be sure to add entries for each directory
2756-that Samba is configured to share. Any errors will be logged to
2757-<filename>/var/log/syslog</filename>.
2758+that <application>Samba</application> is configured to share. Any errors will
2759+be logged to <filename>/var/log/syslog</filename>.
2760 </para>
2761
2762 </sect2>
2763@@ -659,34 +702,38 @@
2764 <itemizedlist>
2765 <listitem>
2766 <para>
2767-For in depth Samba configurations, see the
2768-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
2769+For in depth <application>Samba</application> configurations, see the
2770+<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
2771+<application>Samba</application> HOWTO Collection</ulink>.
2772 </para>
2773 </listitem>
2774 <listitem>
2775 <para>
2776-The guide is also available in
2777-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
2778+The guide is also available in <ulink
2779+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed
2780+format</ulink>.
2781 </para>
2782 </listitem>
2783 <listitem>
2784 <para>
2785 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
2786-Samba</ulink> is also a good reference.
2787+<application>Samba</application></ulink> is also a good reference.
2788 </para>
2789 </listitem>
2790 <listitem>
2791 <para>
2792 <ulink
2793 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/securing-samba.html"
2794->Chapter 18</ulink> of the Samba HOWTO Collection is devoted to security.
2795+>Chapter 18</ulink> of the <application>Samba</application> HOWTO Collection is
2796+devoted to security.
2797 </para>
2798 </listitem>
2799 <listitem>
2800 <para>
2801-For more information on Samba and ACLs, see the
2802-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">Samba ACLs page
2803-</ulink>.
2804+For more information on <application>Samba</application> and ACLs, see the
2805+<ulink
2806+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/AccessControls.html#id397568">
2807+<application>Samba</application> <acronym>ACL</acronym>s page</ulink>.
2808 </para>
2809 </listitem>
2810 </itemizedlist>
2811@@ -697,27 +744,31 @@
2812 <title>Samba as a Domain Controller</title>
2813
2814 <para>
2815-Although it cannot act as an Active Directory Primary Domain Controller (PDC), a
2816-Samba server can be configured to appear as a Windows NT4-style domain
2817-controller. A major advantage of this configuration is the ability to
2818-centralize user and machine credentials. Samba can also use multiple backends
2819-to store the user information.
2820+Although it cannot act as an <trademark class='registered'>Active Directory
2821+Primary Domain Controller</trademark> (<acronym>PDC</acronym>), a
2822+<application>Samba</application> server can be configured to appear as a
2823+<trademark class='registered'>Windows NT</trademark>4-style domain controller.
2824+A major advantage of this configuration is the ability to centralize user and
2825+machine credentials. <application>Samba</application> can also use multiple
2826+backends to store the user information.
2827 </para>
2828
2829 <sect2 id="samba-pdc-smbpasswd">
2830 <title>Primary Domain Controller</title>
2831
2832 <para>
2833-This section covers configuring Samba as a Primary Domain Controller (PDC) using
2834-the default smbpasswd backend.
2835+This section covers configuring <application>Samba</application> as a Primary
2836+Domain Controller (<acronym>PDC</acronym>) using the default
2837+<application>smbpasswd</application> backend.
2838 </para>
2839
2840 <procedure>
2841 <step>
2842
2843 <para>
2844-Install Samba and <application>libpam-smbpass</application> to sync the user
2845-accounts, by entering the following in a terminal prompt:
2846+Install <application>Samba</application> and
2847+<application>libpam-smbpass</application> to sync the user accounts, by
2848+entering the following in a terminal prompt:
2849 </para>
2850
2851 <screen>
2852@@ -728,10 +779,10 @@
2853 <step>
2854
2855 <para>
2856-Next, configure Samba by editing <filename>/etc/samba/smb.conf</filename>. The
2857-<emphasis>security</emphasis> mode should be set to <emphasis
2858-role="italic">user</emphasis>, and the <emphasis>workgroup</emphasis> should
2859-relate to the organization properly:
2860+Next, configure <application>Samba</application> by editing
2861+<filename>/etc/samba/smb.conf</filename>. The <emphasis>security</emphasis>
2862+mode should be set to <emphasis role="italic">user</emphasis>, and the
2863+<emphasis>workgroup</emphasis> should relate to the organization properly:
2864 </para>
2865
2866 <programlisting>
2867@@ -744,7 +795,8 @@
2868 <step>
2869
2870 <para>
2871-In the commented <quote>Domains</quote> section, add or uncomment the following:
2872+In the commented <quote>Domains</quote> section, add or uncomment the
2873+following:
2874 </para>
2875
2876 <programlisting>
2877@@ -753,22 +805,23 @@
2878 logon drive = H:
2879 logon home = \\%N\%U
2880 logon script = logon.cmd
2881-add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d /var/lib/samba -s /bin/false %u
2882+add machine script = sudo /usr/sbin/useradd -N -g machines -c Machine -d
2883+/var/lib/samba -s /bin/false %u
2884 </programlisting>
2885
2886 <itemizedlist>
2887 <listitem>
2888 <para>
2889-<emphasis>domain logons:</emphasis> provides the netlogon service causing Samba
2890-to act as a domain controller.
2891+<emphasis>domain logons:</emphasis> provides the netlogon service causing
2892+<application>Samba</application> to act as a domain controller.
2893 </para>
2894 </listitem>
2895 <listitem>
2896 <para>
2897-<emphasis>logon path:</emphasis> places the user's Windows profile into their
2898-home directory. It is also possible to configure a
2899-<emphasis>[profiles]</emphasis> share placing all profiles under a single
2900-directory.
2901+<emphasis>logon path:</emphasis> places the user's <trademark
2902+class='registered'>Windows</trademark> profile into their home directory. It is
2903+also possible to configure a <emphasis>[profiles]</emphasis> share placing all
2904+profiles under a single directory.
2905 </para>
2906 </listitem>
2907 <listitem>
2908@@ -784,20 +837,20 @@
2909 <listitem>
2910 <para>
2911 <emphasis>logon script:</emphasis> determines the script to be run locally once
2912-a user has logged in. The script needs to be placed in the
2913-<emphasis>[netlogon]</emphasis> share.
2914+a user has logged in. The script needs to be placed in the
2915+<emphasis>[netlogon]</emphasis> share.
2916 </para>
2917 </listitem>
2918 <listitem>
2919 <para>
2920-<emphasis>add machine script:</emphasis> a script that will automatically create
2921-the <emphasis>Machine Trust Account</emphasis> needed for a workstation to join
2922-the domain.
2923+<emphasis>add machine script:</emphasis> a script that will automatically
2924+create the <emphasis>Machine Trust Account</emphasis> needed for a workstation
2925+to join the domain.
2926 </para>
2927 <para>
2928-In this example, the <emphasis>machines</emphasis> group will need to be created
2929-using the <application>addgroup</application> utility. See <ulink type="help"
2930-url="help:/kubuntu/basics/"> Basics</ulink> for details.
2931+In this example, the <emphasis>machines</emphasis> group will need to be
2932+created using the <application>addgroup</application> utility. See <ulink
2933+type="help" url="help:/kubuntu/basics/"> Basics</ulink> for details.
2934 </para>
2935 </listitem>
2936 </itemizedlist>
2937@@ -833,7 +886,7 @@
2938
2939 <para>
2940 When configured as a domain controller, a <emphasis>[netlogon]</emphasis> share
2941-needs to be configured. To enable the share, uncomment:
2942+needs to be configured. To enable the share, uncomment:
2943 </para>
2944
2945 <programlisting>
2946@@ -849,7 +902,7 @@
2947 <para>
2948 The original <emphasis>netlogon</emphasis> share path is
2949 <filename>/home/samba/netlogon</filename>, but according to the Filesystem
2950-Hierarchy Standard (FHS), <ulink
2951+Hierarchy Standard (<acronym>FHS</acronym>), <ulink
2952 url="http://www.pathname.com/fhs/pub/fhs-2.3.
2953 html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM">/srv</ulink> is the correct location
2954 for site-specific data provided by the system.
2955@@ -860,7 +913,7 @@
2956 <step>
2957
2958 <para>
2959-Now create the <filename role="directory">netlogon</filename> directory, and an
2960+Now create the <filename role="directory">netlogon</filename> directory and an
2961 empty (for now) <filename>logon.cmd</filename> script file:
2962 </para>
2963
2964@@ -870,8 +923,9 @@
2965 </screen>
2966
2967 <para>
2968-Any normal Windows logon script commands can be entered in
2969-<filename>logon.cmd</filename> to customize the client's environment.
2970+Any normal <trademark class='registered'>Windows</trademark> logon script
2971+commands can be entered in <filename>logon.cmd</filename> to customize the
2972+client's environment.
2973 </para>
2974
2975 </step>
2976@@ -879,9 +933,9 @@
2977
2978 <para>
2979 With <emphasis>root</emphasis> being disabled by default, in order to join a
2980-workstation to the domain, a system group must be mapped to the Windows
2981-<emphasis>Domain Admins</emphasis> group. Using the
2982-<application>net</application> utility, from a terminal enter:
2983+workstation to the domain, a system group must be mapped to the <trademark
2984+class='registered'>Windows</trademark> <emphasis>Domain Admins</emphasis>
2985+group. Using the <application>net</application> utility, from a terminal enter:
2986 </para>
2987
2988 <screen>
2989@@ -892,9 +946,9 @@
2990 <note>
2991 <para>
2992 Change <emphasis role="italic">sysadmin</emphasis> to the preferred group. The
2993-user used to join the domain needs to be a member of the
2994+user used to join the domain needs to be a member of the
2995 <emphasis>sysadmin</emphasis> group, as well as a member of the system
2996-<emphasis>admin</emphasis> group. The <emphasis>admin</emphasis> group allows
2997+<emphasis>admin</emphasis> group. The <emphasis>admin</emphasis> group allows
2998 <application>sudo</application> use.
2999 </para>
3000 </note>
3001@@ -903,7 +957,8 @@
3002 <step>
3003
3004 <para>
3005-Finally, restart Samba to enable the new domain controller:
3006+Finally, restart <application>Samba</application> to enable the new domain
3007+controller:
3008 </para>
3009
3010 <screen>
3011@@ -914,8 +969,10 @@
3012 <step>
3013
3014 <para>
3015-It is now possible to join Windows clients to the Domain in the same manner as
3016-joining them to an NT4 domain running on a Windows server.
3017+It is now possible to join <trademark class='registered'>Windows</trademark>
3018+clients to the domain in the same manner as joining them to an <trademark
3019+class='registered'>NT4</trademark> domain running on a <trademark
3020+class='registered'>Windows</trademark> server.
3021 </para>
3022
3023 </step>
3024@@ -926,32 +983,36 @@
3025 <title>Backup Domain Controller</title>
3026
3027 <para>
3028-With a Primary Domain Controller (PDC) on the network, it is best to have a
3029-Backup Domain Controller (BDC) as well. This will allow clients to authenticate
3030-in case the PDC becomes unavailable.
3031+With a Primary Domain Controller (<acronym>PDC</acronym>) on the network, it is
3032+best to have a Backup Domain Controller (<acronym>BDC</acronym>) as well. This
3033+will allow clients to authenticate in case the <acronym>PDC</acronym> becomes
3034+unavailable.
3035 </para>
3036
3037 <para>
3038-When configuring Samba as a BDC, there must be a way to sync account information
3039-with the PDC. There are multiple ways of accomplishing this, such as
3040+When configuring <application>Samba</application> as a <acronym>BDC</acronym>,
3041+there must be a way to sync account information with the
3042+<acronym>PDC</acronym>. There are multiple ways of accomplishing this, such as
3043 <application>scp</application>, <application>rsync</application>, or by using
3044 <application>LDAP</application> as the <emphasis>passdb backend</emphasis>.
3045 </para>
3046
3047 <para>
3048-Using LDAP is the most robust way to sync account information, because both
3049-domain controllers can use the same information in real time. However, setting
3050-up a LDAP server may be overly complicated for a small number of user and
3051-computer accounts. See Samba<ulink
3052-url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP"> LDAP</ulink> page for
3053-details.
3054+Using <application>LDAP</application> is the most robust way to sync account
3055+information, because both domain controllers can use the same information in
3056+real time. However, setting up an <application>LDAP</application> server may be
3057+overly complicated for a small number of user and computer accounts. See
3058+<application>Samba</application> <ulink
3059+url="http://wiki.samba.org/index.php/Samba_&amp;_LDAP">
3060+<application>LDAP</application></ulink> page for details.
3061 </para>
3062
3063 <procedure>
3064 <step>
3065
3066 <para>
3067-First, install <application>samba</application> and <application>libpam-smbpass</application>. From a terminal enter:
3068+First, install <application>samba</application> and
3069+<application>libpam-smbpass</application>. From a terminal, enter:
3070 </para>
3071
3072 <screen>
3073@@ -976,7 +1037,7 @@
3074 <step>
3075
3076 <para>
3077-In the commented <emphasis>Domains</emphasis> uncomment or add:
3078+In the commented <emphasis>Domains</emphasis>, uncomment or add:
3079 </para>
3080
3081 <programlisting>
3082@@ -988,8 +1049,9 @@
3083 <step>
3084
3085 <para>
3086-Make sure a user has rights to read the files in <filename>/var/lib/samba</filename>. For example, to allow users in the
3087-<emphasis>admin</emphasis> group to <application>scp</application> the files,
3088+Make sure a user has rights to read the files in
3089+<filename>/var/lib/samba</filename>. For example, to allow users in the
3090+<emphasis>admin</emphasis> group to <application>scp</application> the files,
3091 enter:
3092 </para>
3093
3094@@ -1002,7 +1064,7 @@
3095
3096 <para>
3097 Next, sync the user accounts, using <application>scp</application> to copy the
3098-<filename>/var/lib/samba</filename> directory from the PDC:
3099+<filename>/var/lib/samba</filename> directory from the <acronym>PDC</acronym>:
3100 </para>
3101
3102 <screen>
3103@@ -1012,7 +1074,8 @@
3104 <note>
3105 <para>
3106 Replace <emphasis>username</emphasis> with a valid username and
3107-<emphasis>pdc</emphasis> with the hostname or IP Address of the actual PDC.
3108+<emphasis>pdc</emphasis> with the hostname or <acronym>IP</acronym> Address of
3109+the actual <acronym>PDC</acronym>.
3110 </para>
3111 </note>
3112
3113@@ -1031,16 +1094,19 @@
3114 </procedure>
3115
3116 <para>
3117-Test that the Backup Domain controller is working by stopping the Samba daemon
3118-on the PDC, then trying to login to a Windows client joined to the domain.
3119+Test that the Backup Domain controller is working by stopping the
3120+<application>Samba</application> daemon on the <application>PDC</application>,
3121+then trying to login to a <trademark class='registered'>Windows</trademark>
3122+client joined to the domain.
3123 </para>
3124
3125 <para>
3126-If the <emphasis>logon home</emphasis> option has been configured as a directory
3127-on the PDC, and the PDC becomes unavailable, access to the user's
3128-<emphasis>Home</emphasis> drive will also be unavailable. For this reason,
3129-it is best to configure the <emphasis>logon home</emphasis> to reside on a
3130-separate file server from the PDC and BDC.
3131+If the <emphasis>logon home</emphasis> option has been configured as a
3132+directory on the <acronym>PDC</acronym>, and the <acronym>PDC</acronym> becomes
3133+unavailable, access to the user's <emphasis>Home</emphasis> drive will also be
3134+unavailable. For this reason, it is best to configure the <emphasis>logon
3135+home</emphasis> to reside on a separate file server from the
3136+<acronym>PDC</acronym> and <acronym>BDC</acronym>.
3137 </para>
3138
3139 </sect2>
3140@@ -1051,36 +1117,38 @@
3141 <itemizedlist>
3142 <listitem>
3143 <para>
3144-For in depth Samba configurations see the
3145-<ulink url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">Samba HOWTO Collection</ulink>
3146+For indepth <application>Samba</application> configurations, see the <ulink
3147+url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/">
3148+<application>Samba</application> HOWTO Collection</ulink>.
3149 </para>
3150 </listitem>
3151 <listitem>
3152 <para>
3153-The guide is also available in
3154-<ulink url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format</ulink>.
3155+The guide is also available in <ulink
3156+url="http://www.amazon.com/exec/obidos/tg/detail/-/0131882228">printed format
3157+</ulink>.
3158 </para>
3159 </listitem>
3160 <listitem>
3161 <para>
3162 O'Reilly's <ulink url="http://www.oreilly.com/catalog/9780596007690/">Using
3163-Samba</ulink> is also a good reference.
3164+<application>Samba</application></ulink> is also a good reference.
3165 </para>
3166 </listitem>
3167 <listitem>
3168 <para>
3169 <ulink
3170 url="http://samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-pdc.html">
3171-Chapter 4</ulink> of the Samba HOWTO Collection explains setting up a Primary
3172-Domain Controller.
3173+Chapter 4</ulink> of the <application>Samba</application> HOWTO Collection
3174+explains setting up a Primary Domain Controller.
3175 </para>
3176 </listitem>
3177 <listitem>
3178 <para>
3179 <ulink
3180 url="http://us3.samba.org/samba/docs/man/Samba-HOWTO-Collection/samba-bdc.html">
3181-Chapter 5</ulink> of the Samba HOWTO Collection explains setting up a Backup
3182-Domain Controller.
3183+Chapter 5</ulink> of the <application>Samba</application> HOWTO Collection
3184+explains setting up a Backup Domain Controller.
3185 </para>
3186 </listitem>
3187 </itemizedlist>
3188@@ -1095,14 +1163,16 @@
3189 <title>Accessing a Samba Share</title>
3190
3191 <para>
3192-Another use for Samba is to integrate into an existing Windows network. Once
3193-part of an Active Directory (AD) domain, Samba can provide file and print
3194-services to AD users.
3195+Another use for <application>Samba</application> is to integrate into an
3196+existing <trademark class='registered'>Windows</trademark> network. Once part
3197+of an <trademark class='registered'>Active Directory</trademark>
3198+(<acronym>AD</acronym>) domain, <application>Samba</application> can provide
3199+file and print services to <acronym>AD</acronym> users.
3200 </para>
3201
3202 <para>
3203-The simplest way to join an AD domain is to use
3204-<application>Likewise-open</application>. For detailed instructions, see <xref
3205+The simplest way to join an <acronym>AD</acronym> domain is to use
3206+<application>Likewise-open</application>. For detailed instructions, see <xref
3207 linkend="likewise-open"/>.
3208 </para>
3209
3210@@ -1115,13 +1185,15 @@
3211 </screen>
3212
3213 <para>
3214-Since the <application>likewise-open</application> and <application>samba</application> packages use separate
3215+Since the <application>likewise-open</application> and
3216+<application>samba</application> packages use separate
3217 <filename>secrets.tdb</filename> files, a symlink must be created in <filename
3218 role="directory">/var/lib/samba</filename>:
3219 </para>
3220
3221 <screen>
3222-<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig</command>
3223+<command>sudo mv /var/lib/samba/secrets.tdb /var/lib/samba/secrets.tdb.orig
3224+</command>
3225 <command>sudo ln -s /etc/samba/secrets.tdb /var/lib/samba</command>
3226 </screen>
3227
3228@@ -1150,10 +1222,10 @@
3229
3230 <para>
3231 It should now be possible to access any <application>Samba</application> shares
3232-from a Windows client. However, be sure to give the appropriate AD users or
3233-groups access to the share directory. See <xref
3234-linkend="samba-fileprint-security"/> for
3235-more details.
3236+from a <trademark class='registered'>Windows</trademark> client. However, be
3237+sure to give the appropriate <acronym>AD</acronym> users or groups access to
3238+the share directory. See <xref linkend="samba-fileprint-security"/> for more
3239+details.
3240 </para>
3241
3242 </sect2>
3243@@ -1162,23 +1234,25 @@
3244 <title>Accessing a Windows Share</title>
3245
3246 <para>
3247-Now that the Samba server is part of the Active Directory domain, any Windows
3248-server shares can be accessed:
3249+Now that the <application>Samba</application> server is part of the <trademark
3250+class='registered'>Active Directory</trademark> domain, any <trademark
3251+class='registered'>Windows</trademark> server shares can be accessed:
3252 </para>
3253
3254 <itemizedlist>
3255 <listitem>
3256
3257 <para>
3258-To mount a Windows file share, enter the following in a terminal prompt:
3259+To mount a <trademark class='registered'>Windows</trademark> file share, enter
3260+the following in a terminal prompt:
3261 </para>
3262 <screen>
3263 <command>mount.cifs //fs01.example.com/share mount_point</command>
3264 </screen>
3265
3266 <para>
3267-It is also possible to access shares on computers not part of an AD domain, but
3268-a username and password must be provided.
3269+It is also possible to access shares on computers not part of an
3270+<acronym>AD</acronym> domain, but a username and password must be provided.
3271 </para>
3272
3273 </listitem>
3274@@ -1186,7 +1260,7 @@
3275
3276 <para>
3277 To mount the share during boot, place an entry in
3278-<filename>/etc/fstab</filename>, for example:
3279+<filename>/etc/fstab</filename>. For example:
3280 </para>
3281
3282 <programlisting>
3283@@ -1197,9 +1271,10 @@
3284 <listitem>
3285
3286 <para>
3287-Another way to copy files from a Windows server is to use the
3288-<application>smbclient</application> utility. To list the files in a Windows
3289-share:
3290+Another way to copy files from a <trademark
3291+class='registered'>Windows</trademark> server is to use the
3292+<application>smbclient</application> utility. To list the files in a <trademark
3293+class='registered'>Windows</trademark> share:
3294 </para>
3295
3296 <screen>
3297@@ -1229,11 +1304,13 @@
3298 </para>
3299
3300 <screen>
3301-<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"</command>
3302+<command>smbclient //fs01.example.com/share -k -c "put /etc/hosts hosts"
3303+</command>
3304 </screen>
3305
3306 <para>
3307-This will copy the <filename>/etc/hosts</filename> to <filename>//fs01.example.com/share/hosts</filename>.
3308+This will copy the <filename>/etc/hosts</filename> to
3309+<filename>//fs01.example.com/share/hosts</filename>.
3310 </para>
3311
3312 </listitem>
3313@@ -1241,10 +1318,11 @@
3314
3315 <para>
3316 The <emphasis>-c</emphasis> option used above allows execution of the
3317-<application>smbclient</application> command all at once. This is useful for
3318-scripting and minor file operations. To enter the <emphasis>smb:
3319-\&gt;</emphasis> prompt, an FTP-like prompt where normal file and directory
3320-commands can be executed, simply run the following in Konsole:
3321+<application>smbclient</application> command all at once. This is useful for
3322+scripting and minor file operations. To enter the <emphasis>smb:
3323+\&gt;</emphasis> prompt, an <acronym>FTP</acronym>-like prompt where normal
3324+file and directory commands can be executed, simply run the following in
3325+<application>Konsole</application>:
3326 </para>
3327
3328 <screen>
3329@@ -1256,11 +1334,12 @@
3330
3331 <note>
3332 <para>
3333-Replace all instances of <emphasis>fs01.example.com/share</emphasis>, <emphasis>//192.168.0.5/share</emphasis>,
3334+Replace all instances of <emphasis>fs01.example.com/share</emphasis>,
3335+<emphasis>//192.168.0.5/share</emphasis>,
3336 <emphasis>username=steve,password=secret</emphasis>, and
3337-<emphasis>file.txt</emphasis> with the proper server IP, hostname,
3338-share name, file name, and an actual username and password with rights to the
3339-share.
3340+<emphasis>file.txt</emphasis> with the proper server <acronym>IP</acronym>,
3341+hostname, share name, file name, and an actual username and password with
3342+rights to the share.
3343 </para>
3344 </note>
3345
3346@@ -1269,9 +1348,11 @@
3347 <title>Resources</title>
3348
3349 <para>
3350-For more <application>smbclient</application> options see the man page:
3351+For more <application>smbclient</application> options, see the man page:
3352 <command>man smbclient</command>, also available
3353-<ulink url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">online</ulink>.
3354+<ulink
3355+url="http://manpages.ubuntu.com/manpages/jaunty/en/man1/smbclient.1.html">
3356+online</ulink>.
3357 </para>
3358
3359 <para>
3360@@ -1289,24 +1370,27 @@
3361
3362 <para>
3363 <application>Likewise Open</application> simplifies the necessary configuration
3364-needed to authenticate a Linux machine to an Active Directory domain. Based on
3365-<application>winbind</application>, the <application>likewise-open</application>
3366-package takes the pain out of integrating &kubuntu; authentication into an
3367-existing Windows network.
3368+needed to authenticate a <trademark>Linux</trademark> machine to an <trademark
3369+class='registered'>Active Directory</trademark> domain. Based on
3370+<application>winbind</application>, the
3371+<application>likewise-open</application> package takes the pain out of
3372+integrating &kubuntu; authentication into an existing <trademark
3373+class='registered'>Windows</trademark> network.
3374 </para>
3375
3376 <sect2 id="likewise-open-install">
3377 <title>Installation</title>
3378
3379 <para>
3380-There are two ways to use Likewise Open,
3381+There are two ways to use Likewise Open:
3382 <application>likewise-open</application> the command line utility and
3383-<application>likewise-open-gui</application>. This section focuses on the
3384+<application>likewise-open-gui</application>. This section focuses on the
3385 command line utility.
3386 </para>
3387
3388 <para>
3389-To install the <application>likewise-open</application> package, open a terminal prompt and enter:
3390+To install the <application>likewise-open</application> package, open a
3391+terminal and enter:
3392 </para>
3393
3394 <screen>
3395@@ -1322,7 +1406,7 @@
3396 </para>
3397
3398 <para>
3399-To install <application>Likewise Open 5.0</application> enter:
3400+To install <application>Likewise Open 5.0</application>, enter:
3401 </para>
3402
3403 <screen>
3404@@ -1331,8 +1415,9 @@
3405
3406 <warning>
3407 <para>
3408-Installing likewise-open5 over an existing likewise-open (4.1) installation will
3409-replace it. The domain will have to be rejoined after install.
3410+Installing <application>likewise-open5</application> over an existing
3411+<application>likewise-open</application> (4.1) installation will replace it.
3412+The domain will have to be rejoined after install.
3413 </para>
3414 </warning>
3415
3416@@ -1349,25 +1434,29 @@
3417 <itemizedlist>
3418 <listitem>
3419 <para>
3420-Access to an Active Directory user with appropriate rights to join the domain.
3421-</para>
3422-</listitem>
3423-<listitem>
3424-<para>
3425-The <emphasis>Fully Qualified Domain Name</emphasis> (FQDN) of the domain
3426-being joined. If the AD domain does not match a valid domain such as <emphasis
3427-role="italic">example.com</emphasis>, it is likely that it is in the form of
3428-<emphasis>domainname.local</emphasis>.
3429-</para>
3430-</listitem>
3431-<listitem>
3432-<para>
3433-DNS for the domain set up properly. In a production AD environment, this
3434-is typically the case. Proper Microsoft DNS is needed so that client
3435-workstations can determine that the Active Directory domain is available.
3436-</para>
3437-<para>
3438-If there is not a Windows DNS server on the network, see <xref
3439+Access to an <trademark class='registered'>Active Directory</trademark> user
3440+with appropriate rights to join the domain.
3441+</para>
3442+</listitem>
3443+<listitem>
3444+<para>
3445+The <emphasis>Fully Qualified Domain Name</emphasis> (<acronym>FQDN</acronym>)
3446+of the domain being joined. If the <acronym>AD</acronym> domain does not match
3447+a valid domain such as <emphasis role="italic">example.com</emphasis>, it is
3448+likely that it is in the form of <emphasis>domainname.local</emphasis>.
3449+</para>
3450+</listitem>
3451+<listitem>
3452+<para>
3453+<acronym>DNS</acronym> for the domain set up properly. In a production
3454+<acronym>AD</acronym> environment, this is typically the case. Proper
3455+<trademark class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is
3456+needed so that client workstations can determine that the <trademark
3457+class='registered'>Active Directory</trademark> domain is available.
3458+</para>
3459+<para>
3460+If there is not a <trademark class='registered'>Windows</trademark>
3461+<acronym>DNS</acronym> server on the network, see <xref
3462 linkend="likewise-open-ms-dns"/> for details.
3463 </para>
3464
3465@@ -1390,22 +1479,23 @@
3466 </note>
3467
3468 <para>
3469-There will be a prompt for the user's password. If all goes well, a
3470+There will be a prompt for the user's password. If all goes well, a
3471 <emphasis>SUCCESS</emphasis> message should be printed to the console.
3472 </para>
3473
3474 <note>
3475 <para>
3476-After joining the domain, it is necessary to reboot before
3477-attempting to authenticate against the domain.
3478+After joining the domain, it is necessary to reboot before attempting to
3479+authenticate against the domain.
3480 </para>
3481 </note>
3482
3483 <para>
3484-After successfully joining an &kubuntu; machine to an Active Directory domain,
3485-any valid AD user can be used to authenticate. To login, the user name must be
3486-entered as 'domain\username'. For example to ssh to a server joined to the
3487-domain, enter:
3488+After successfully joining an &kubuntu; machine to an <trademark
3489+class='registered'>Active Directory</trademark> domain, any valid
3490+<acronym>AD</acronym> user can be used to authenticate. To log in, the user
3491+name must be entered as 'domain\username'. For example, to
3492+<command>ssh</command> to a server joined to the domain, enter:
3493 </para>
3494
3495 <screen>
3496@@ -1414,14 +1504,15 @@
3497
3498 <note>
3499 <para>
3500-If configuring a Desktop, the user name will need to be prefixed with <emphasis
3501+If configuring a desktop, the user name will need to be prefixed with <emphasis
3502 role="italic">domain\</emphasis> in the graphical logon as well.
3503 </para>
3504 </note>
3505
3506 <para>
3507-To make likewise-open use a default domain, the following statement can be added
3508-to <filename>/etc/samba/lwiauthd.conf</filename>:
3509+To make <application>likewise-open</application> use a default domain, the
3510+following statement can be added to
3511+<filename>/etc/samba/lwiauthd.conf</filename>:
3512 </para>
3513
3514 <programlisting>
3515@@ -1439,14 +1530,14 @@
3516 <note>
3517 <para>
3518 Once configured for a <emphasis>default domain</emphasis>, the <emphasis
3519-role="italic">'domain\'</emphasis> is no longer required. Users can login using
3520-only their username.
3521+role="italic">'domain\'</emphasis> is no longer required. Users can log in
3522+using only their username.
3523 </para>
3524 </note>
3525
3526 <para>
3527 The <application>domainjoin-cli</application> utility can also be used to leave
3528-the domain. From a terminal:
3529+the domain. From a terminal:
3530 </para>
3531
3532 <screen>
3533@@ -1459,34 +1550,36 @@
3534
3535 <para>
3536 The <application>likewise-open</application> package comes with a few other
3537-utilities that may be useful for gathering information about the Active
3538-Directory environment. These utilities are used to join the machine to the
3539-domain, and are the same as those available in the
3540-<application>samba-common</application> and <application>winbind</application>
3541-packages:
3542+utilities that may be useful for gathering information about the <trademark
3543+class='registered'>Active Directory</trademark> environment. These utilities
3544+are used to join the machine to the domain, and are the same as those available
3545+in the <application>samba-common</application> and
3546+<application>winbind</application> packages:
3547 </para>
3548
3549 <itemizedlist>
3550 <listitem>
3551 <para>
3552-<application>lwinet</application>: Returns information about the network and the domain.
3553-</para>
3554-</listitem>
3555-<listitem>
3556-<para>
3557-<application>lwimsg</application>: Allows interaction with the <application>likewise-winbindd</application> daemon.
3558-</para>
3559-</listitem>
3560-<listitem>
3561-<para>
3562-<application>lwiinfo</application>: Displays information about various parts of
3563-the Domain.
3564+<application>lwinet</application>: Returns information about the network and
3565+the domain.
3566+</para>
3567+</listitem>
3568+<listitem>
3569+<para>
3570+<application>lwimsg</application>: Allows interaction with the
3571+<application>likewise-winbindd</application> daemon.
3572+</para>
3573+</listitem>
3574+<listitem>
3575+<para>
3576+<application>lwiinfo</application>: Displays information about various parts of
3577+the domain.
3578 </para>
3579 </listitem>
3580 </itemizedlist>
3581
3582 <para>
3583-Please refer to each utility's man page specific for details.
3584+Please refer to each utility's man page for details.
3585 </para>
3586
3587 </sect2>
3588@@ -1496,8 +1589,9 @@
3589 <itemizedlist>
3590 <listitem>
3591 <para>
3592-If the client has trouble joining the domain, check that the Microsoft DNS is
3593-listed first in <filename>/etc/resolv.conf</filename>.
3594+If the client has trouble joining the domain, check that the <trademark
3595+class='registered'>Microsoft</trademark> <acronym>DNS</acronym> is listed first
3596+in <filename>/etc/resolv.conf</filename>.
3597 For example:
3598 </para>
3599
3600@@ -1507,26 +1601,30 @@
3601 </listitem>
3602 <listitem>
3603 <para>
3604-For more information when joining a domain, use the <emphasis>--loglevel verbose</emphasis> or <emphasis>--advanced</emphasis> option of the
3605+For more information when joining a domain, use the <emphasis>--loglevel
3606+verbose</emphasis> or <emphasis>--advanced</emphasis> option of the
3607 <application>domainjoin-cli</application> utility:
3608 </para>
3609
3610 <screen>
3611-<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator</command>
3612+<command>sudo domainjoin-cli --loglevel verbose join example.com Administrator
3613+</command>
3614 </screen>
3615 </listitem>
3616 <listitem>
3617 <para>
3618-If an Active Directory user has trouble logging in, check the <filename>/var/log/auth.log</filename> for details.
3619+If an <trademark class='registered'>Active Directory</trademark> user has
3620+trouble logging in, check the <filename>/var/log/auth.log</filename> for
3621+details.
3622 </para>
3623 </listitem>
3624 <listitem>
3625 <para>
3626-When joining an &kubuntu; Desktop workstation to a domain, it may be necessary
3627-to edit <filename>/etc/nsswitch.conf</filename> if the AD domain uses the
3628-<emphasis role="italic">.local</emphasis> syntax. In order to join the domain,
3629-the <emphasis>"mdns4"</emphasis> entry should be removed from the
3630-<emphasis>hosts</emphasis> option. For example:
3631+When joining a &kubuntu; Desktop workstation to a domain, it may be necessary
3632+to edit <filename>/etc/nsswitch.conf</filename> if the <acronym>AD</acronym>
3633+domain uses the <emphasis role="italic">.local</emphasis> syntax. In order to
3634+join the domain, the <emphasis>"mdns4"</emphasis> entry should be removed from
3635+the <emphasis>hosts</emphasis> option. For example:
3636 </para>
3637
3638 <programlisting>
3639@@ -1550,7 +1648,8 @@
3640 </screen>
3641
3642 <para>
3643-It should now be possible to join the Active Directory domain.
3644+It should now be possible to join the <trademark
3645+class='registered'>Active Directory</trademark> domain.
3646 </para>
3647 </listitem>
3648 </itemizedlist>
3649@@ -1560,9 +1659,10 @@
3650 <title>Microsoft DNS</title>
3651
3652 <para>
3653-The following are instructions for installing DNS on an Active Directory domain
3654-controller running Windows Server 2003, but the instructions should be similar
3655-for other versions:
3656+The following are instructions for installing <acronym>DNS</acronym> on an
3657+<trademark class='registered'>Active Directory</trademark> domain controller
3658+running <trademark class='registered'>Windows Server 2003</trademark>, but the
3659+instructions should be similar for other versions:
3660 </para>
3661
3662 <!-- Translators: please check http://www.microsoft.com/language/en/us/search.mspx to see how this string is translated in Windows to your language -->
3663@@ -1577,41 +1677,62 @@
3664 This will open the <application>Server Role Management</application> utility.
3665 </para>
3666 <orderedlist>
3667-<listitem><para>Click <guilabel>Add or remove a role</guilabel></para></listitem>
3668-<listitem><para>Click Next</para></listitem>
3669-<listitem><para>Select "DNS Server"</para></listitem>
3670-<listitem><para>Click Next</para></listitem>
3671-<listitem><para>Click Next again to proceed </para></listitem>
3672-<listitem><para>Select "Create a forward lookup zone" if it is not selected.</para></listitem>
3673-<listitem><para>Click Next</para></listitem>
3674-<listitem><para>Make sure "This server maintains the zone" is selected and click Next.</para></listitem>
3675-<listitem><para>Enter the domain name and click Next</para></listitem>
3676-<listitem><para>Click Next to "Allow only secure dynamic updates"</para></listitem>
3677+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Add or remove a
3678+role</guilabel>.</para></listitem>
3679+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3680+</para></listitem>
3681+<listitem><para>Select "<acronym>DNS</acronym> Server".</para></listitem>
3682+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3683+</para></listitem>
3684+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>
3685+again to proceed.</para></listitem>
3686+<listitem><para>Select "Create a forward lookup zone" if it is not selected.
3687+</para></listitem>
3688+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel>.
3689+</para></listitem>
3690+<listitem><para>Make sure "This server maintains the zone" is selected and
3691+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.</para></listitem>
3692+<listitem><para>Enter the domain name and <mousebutton>click</mousebutton>
3693+<guilabel>Next</guilabel>.</para></listitem>
3694+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Next</guilabel> to
3695+"Allow only secure dynamic updates".</para></listitem>
3696 <listitem>
3697 <para>
3698-Enter the IP for DNS servers to forward queries to, or Select "No, it should not forward queries" and click Next.
3699+Enter the <acronym>IP</acronym> for <acronym>DNS</acronym> servers to forward
3700+queries to, or Select "No, it should not forward queries" and
3701+<mousebutton>click</mousebutton> <guilabel>Next</guilabel>.
3702 </para>
3703 </listitem>
3704-<listitem><para>Click Finish</para></listitem>
3705-<listitem><para>Click Finish</para></listitem>
3706+<listitem><para><mousebutton>Click</mousebutton>
3707+<guilabel>Finish</guilabel></para></listitem>
3708+<listitem><para><mousebutton>Click</mousebutton>
3709+<guilabel>Finish</guilabel></para></listitem>
3710 </orderedlist>
3711 <para>
3712-DNS is now installed and can be further configured using the <application>Microsoft Management Console</application> DNS snap-in.
3713+<acronym>DNS</acronym> is now installed and can be further configured using the
3714+<application>Microsoft Management Console</application> <acronym>DNS</acronym>
3715+snap-in.
3716 </para>
3717 </listitem>
3718 <listitem>
3719 <para>
3720-Next, configure the Server to use itself for DNS queries:
3721+Next, configure the server to use itself for <acronym>DNS</acronym> queries:
3722 <orderedlist>
3723-<listitem><para>Click Start</para></listitem>
3724+<listitem><para><mousebutton>Click</mousebutton> <guilabel>Start</guilabel>
3725+</para></listitem>
3726 <listitem><para>Control Panel</para></listitem>
3727 <listitem><para>Network Connections</para></listitem>
3728-<listitem><para>Right Click "Local Area Connection"</para></listitem>
3729-<listitem><para>Click Properties</para></listitem>
3730-<listitem><para>Double click "Internet Protocol (TCP/IP)"</para></listitem>
3731-<listitem><para>Enter the Server's IP Address as the "Preferred DNS server"</para></listitem>
3732-<listitem><para>Click Ok</para></listitem>
3733-<listitem><para>Click Ok again to save the settings</para></listitem>
3734+<listitem><para><mousebutton>Right click</mousebutton> "Local Area Connection"
3735+</para></listitem>
3736+<listitem><para><mousebutton>Click</mousebutton> Properties</para></listitem>
3737+<listitem><para><mousebutton>Double click</mousebutton> "Internet Protocol
3738+(<acronym>TCP</acronym>/<acronym>IP</acronym>)"</para></listitem>
3739+<listitem><para>Enter the server's <acronym>IP</acronym> address as the
3740+"Preferred <acronym>DNS</acronym> server"</para></listitem>
3741+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton>
3742+</para></listitem>
3743+<listitem><para><mousebutton>Click</mousebutton> <guibutton>Ok</guibutton>
3744+again to save the settings</para></listitem>
3745 </orderedlist>
3746 </para>
3747 </listitem>
3748@@ -1621,11 +1742,13 @@
3749 <title>References</title>
3750
3751 <para>
3752-Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise</ulink> home page for further information.
3753+Please refer to the <ulink url="http://www.likewisesoftware.com/">Likewise
3754+</ulink> home page for further information.
3755 </para>
3756
3757 <para>
3758-For more <application>domainjoin-cli</application> options see the man page: <command>man domainjoin-cli</command>.
3759+For more <application>domainjoin-cli</application> options, see the man page:
3760+<command>man domainjoin-cli</command>.
3761 </para>
3762
3763 </sect2>
3764
3765=== modified file 'docs/video/C/video.xml'
3766--- docs/video/C/video.xml 2011-09-15 06:32:00 +0000
3767+++ docs/video/C/video.xml 2012-03-22 18:52:20 +0000
3768@@ -21,14 +21,15 @@
3769 <sect1 id="introduction">
3770 <title>Introduction</title>
3771 <para>
3772-&kubuntu; comes with a video player installed by default called
3773-<application>Dragon Player</application>. It is a simple and lightweight video
3774+&kubuntu; comes with a video player installed by default called
3775+<application>Dragon Player</application>. It is a simple and light-weight video
3776 player that can play almost any video file (provided the necessary codecs are
3777-installed). For video editing, the preferred choice is
3778-<application>Kino</application>, a non-linear video editor.
3779-<application>Kino</application> is not installed by default with &kubuntu;, but
3780-it can be easily installed from the &kubuntu; Software Center:
3781-(<application>Muon</application>).
3782+installed). For video editing, the preferred choice is
3783+<application>Kino</application> &mdash; a non-linear video editor.
3784+<application>Kino</application> is not installed by default in &kubuntu;, but
3785+can be easily installed from the &kubuntu; Software Center:
3786+(<application>Muon</application>), which can be started by choosing
3787+&menusysmuon;.
3788 </para>
3789 </sect1>
3790
3791@@ -41,16 +42,20 @@
3792
3793 <procedure>
3794 <title>Open Files From The File Manager</title>
3795-<step><para>Open the <application>Dolphin</application> file manager.</para></step>
3796+<step><para>Open the <application>Dolphin</application> file manager.
3797+</para></step>
3798 <step><para>Navigate to the video file.</para></step>
3799-<step><para>Click on the file name to open it with the default video player (<application>Dragon Player</application>).</para></step>
3800+<step><para>Click on the file name to open it with the default video player
3801+(<application>Dragon Player</application>).</para></step>
3802 </procedure>
3803
3804 <procedure>
3805 <title>Open Files From Within Dragon Player</title>
3806-<step><para>Open <application>Dragon Player</application>; &menudragon;</para></step>
3807-<step><para>Click on the <guibutton>Play File</guibutton> button or press <keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
3808-<step><para>Navigate to the selected video file, and click
3809+<step><para>Open <application>Dragon Player</application>; &menudragon;</para>
3810+</step>
3811+<step><para>Click on the <guibutton>Play File</guibutton> button or press
3812+<keycombo><keycap>Ctrl</keycap><keycap>O</keycap></keycombo></para></step>
3813+<step><para>Navigate to the selected video file, and click
3814 <guibutton>Open</guibutton></para></step>
3815 </procedure>
3816
3817@@ -61,11 +66,11 @@
3818 <title>Editing Videos</title>
3819 <para>
3820 Video editing in &kubuntu; can be done with an application called
3821-<application>Kino</application> a non-linear video editor.
3822+<application>Kino</application> &mdash; a non-linear video editor.
3823 <application>Kino</application> is not installed by default. It can be
3824-installed using <application>Muon</application> by going
3825-to &menusysmuon;.</para>
3826-<para>Here's how to open and edit video files in
3827+installed using <application>Muon</application> by going to &menusysmuon;.
3828+</para>
3829+<para>Here's how to open and edit video files in
3830 <application>Kino</application>:
3831 </para>
3832
3833@@ -84,11 +89,12 @@
3834 <para>To trim a video to shorten it or to export different sections:</para>
3835 <procedure>
3836 <title>Trimming Videos</title>
3837-<step><para>Once a video file has been imported into
3838+<step><para>Once a video file has been imported into
3839 <application>Kino</application>, click on the <guibutton>Trim</guibutton>
3840 button.</para></step>
3841-<step><para>A slider below the video preview can be used to specify the starting
3842-(In Point) and the ending (Out Point) points of the trimmed video.</para></step>
3843+<step><para>A slider below the video preview can be used to specify the
3844+starting (In Point) and the ending (Out Point) points of the trimmed video.
3845+</para></step>
3846 <step><para>Specify the starting and ending points by dragging each end of the
3847 slider.</para></step>
3848 <step><para>After the sliders have been positioned, press the
3849@@ -98,21 +104,20 @@
3850
3851 <procedure>
3852 <title>Exporting videos</title>
3853-<step><para>When the editing, trimming, etc. are complete, the video is ready
3854-to be exported. To do this, click on the <guibutton>Export</guibutton> on the
3855-right side of the window or go to
3856-<menuchoice><guimenu>View</guimenu><guisubmenu>Export</guisubmenu></menuchoice
3857->.</para></step>
3858+<step><para>When the editing, trimming, etc., are complete, the video is ready
3859+to be exported. To do this, click on the <guibutton>Export</guibutton> button
3860+on the right side of the window or go to <menuchoice><guimenu>View</guimenu>
3861+<guisubmenu>Export</guisubmenu></menuchoice>.</para></step>
3862 <step><para>In the Export mode, the output mode can be specified for saving the
3863-edited video. Exporting to a 'DV' file maintains the quality of the video (this
3864-generally results in a large file).</para></step>
3865+edited video. Exporting to a '<acronym>DV</acronym>' file maintains the quality
3866+of the video (this generally results in a large file).</para></step>
3867 <step><para>To export the video to a common format such as
3868 <acronym>AVI</acronym>, select the 'Other' tab and specify the type of video to
3869-export, the quality of the output video and the location where the
3870-video should be saved.</para></step>
3871+export, the quality of the output video and the location the video should be
3872+saved to.</para></step>
3873 <step><para>When the settings have been customized, click on the
3874-<guibutton>Export</guibutton> button to export the file. This may take some time
3875-depending on the size of file, the format, the quality selected and other
3876+<guibutton>Export</guibutton> button to export the file. This may take some
3877+time depending on the size of file, the format, the quality selected, and other
3878 customization choices.</para></step>
3879 </procedure>
3880 </sect1>
3881@@ -120,14 +125,15 @@
3882 <sect1 id="video-codecs">
3883 <title>Video Codecs</title>
3884 <para>
3885-Codecs are software that allow different types of video/audio files to be
3886-played. Some codecs are proprietary, meaning that a license is required to use
3887-them. Some codecs are available under free licenses like GPL.
3888+Codecs are software that allow different types of video/audio files to be
3889+played. Some codecs are proprietary &mdash; meaning that a license is required
3890+to use them. Some codecs are available under free licenses like the
3891+<acronym>GPL</acronym>.
3892 </para>
3893 <para>
3894 &kubuntu; does not come pre-installed with codecs to play proprietary formats
3895-like mp3, rm (Real Media) and others. The necessary codecs can be installed from
3896-the repositories.
3897+like mp3, rm (<trademark>Real Media</trademark>), and others. The necessary
3898+codecs can be installed from the repositories.
3899 </para>
3900 <para>
3901 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: