Merge lp:~littlergirl/kubuntu-docs/contribute into lp:kubuntu-docs/precise
- contribute
- Merge into precise
Proposed by
Little Girl
Status: | Merged |
---|---|
Approved by: | Jonathan Jesse |
Approved revision: | 262 |
Merge reported by: | Jonathan Jesse |
Merged at revision: | not available |
Proposed branch: | lp:~littlergirl/kubuntu-docs/contribute |
Merge into: | lp:kubuntu-docs/precise |
Diff against target: |
829 lines (+241/-182) 3 files modified
docs/basics/C/basics.xml (+27/-28) docs/contribute/C/contribute.xml (+98/-58) docs/manage-software/C/manage-software.xml (+116/-96) |
To merge this branch: | bzr merge lp:~littlergirl/kubuntu-docs/contribute |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonathan Jesse (community) | Approve | ||
Review via email: mp+98080@code.launchpad.net |
Commit message
Description of the change
* Corrected grammar and punctuation.
* Updated some links and instructions.
To post a comment you must log in.
Revision history for this message
Jonathan Jesse (jjesse) wrote : | # |
Merged thanks for the review and please submit more, committed to lp:kubuntu-docs revision 260
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'docs/basics/C/basics.xml' |
2 | --- docs/basics/C/basics.xml 2011-09-14 08:01:10 +0000 |
3 | +++ docs/basics/C/basics.xml 2012-03-18 00:38:31 +0000 |
4 | @@ -40,19 +40,18 @@ |
5 | </para> |
6 | </note> |
7 | <para> |
8 | -A filesystem is a method of storing and organizing files, not only in Linux |
9 | -but also in other computer operating systems. In Linux, most files are |
10 | +A filesystem is a method of storing and organizing files — not only in |
11 | +Linux, but also in other computer operating systems. In Linux, most files are |
12 | <quote>regular files</quote>, except <emphasis>directories</emphasis>, |
13 | <emphasis>special files</emphasis>, <emphasis>links</emphasis>, |
14 | <emphasis>sockets</emphasis>, and <emphasis>named pipes</emphasis>. The most |
15 | -common filetypes that users interact with are regular files, directories and |
16 | +common filetypes that users interact with are regular files, directories, and |
17 | links. |
18 | </para> |
19 | <para> |
20 | -Opening a terminal (in &kubuntu; this is |
21 | -called <application>Konsole</application>) and typing |
22 | -<screen>ls /</screen> |
23 | -brings up a list similar to the following: |
24 | +Opening a terminal (in &kubuntu; this is called |
25 | +<application>Konsole</application>) and typing |
26 | +<screen>ls /</screen> brings up a list similar to the following: |
27 | <screen> |
28 | bin |
29 | boot |
30 | @@ -114,10 +113,10 @@ |
31 | <para> |
32 | A <abbrev>symlink</abbrev> or <quote>symbolic link</quote> to <filename |
33 | class="directory">/media/cdrom</filename>, which itself is a |
34 | -<abbrev>symlink</abbrev> to <filename |
35 | +<abbrev>symlink</abbrev> to <filename |
36 | class="directory">/media/cdrom0</filename>. If a <acronym>CD</acronym> is placed |
37 | into the <acronym>CDROM</acronym> drive, the contents of that CD will be |
38 | -available in <filename class="directory">/media/cdrom0</filename> directory. |
39 | +available in the <filename class="directory">/media/cdrom0</filename> directory. |
40 | </para> |
41 | </listitem> |
42 | </varlistentry> |
43 | @@ -133,8 +132,8 @@ |
44 | <varlistentry><term><filename class="directory">etc</filename></term> |
45 | <listitem> |
46 | <para> |
47 | -Contains all system-related configuration files, used to control |
48 | -the operation of programs. |
49 | +Contains all system-related configuration files used to control the |
50 | +operation of programs. |
51 | </para> |
52 | </listitem> |
53 | </varlistentry> |
54 | @@ -142,8 +141,8 @@ |
55 | <listitem> |
56 | <para> |
57 | Contains a home directory for each user on the system. A user's home directory |
58 | -can contain personal configuration files and files such as documents, music, |
59 | -video, and other user-defined directories and files. |
60 | +can contain personal configuration files, documents, music, videos, and other |
61 | +user-defined directories and files. |
62 | </para> |
63 | </listitem> |
64 | </varlistentry> |
65 | @@ -158,8 +157,8 @@ |
66 | <varlistentry><term><filename class="directory">lib</filename></term> |
67 | <listitem> |
68 | <para> |
69 | -Contains the kernel modules in addition to shared library images needed to boot |
70 | -the system and run commands. |
71 | +Contains the kernel modules and shared library images needed to boot the |
72 | +system and run commands. |
73 | </para> |
74 | </listitem> |
75 | </varlistentry> |
76 | @@ -182,7 +181,7 @@ |
77 | <varlistentry><term><filename class="directory">lost+found</filename></term> |
78 | <listitem> |
79 | <para> |
80 | -Contains the results of any recovery operation due to an improper shutdown of |
81 | +Contains the results of any recovery operation due to an improper shut-down of |
82 | the system or a system crash. |
83 | </para> |
84 | </listitem> |
85 | @@ -190,7 +189,7 @@ |
86 | <varlistentry><term><filename class="directory">media</filename></term> |
87 | <listitem> |
88 | <para> |
89 | -Contains the subdirectories which are used as mount points for removable media |
90 | +Contains the subdirectories which are used as mount points for removable media, |
91 | such as <acronym>CDROM</acronym> drives, <acronym>USB</acronym> disks, floppy |
92 | disks. |
93 | </para> |
94 | @@ -200,7 +199,7 @@ |
95 | <listitem> |
96 | <para> |
97 | Generic mount point for filesystems or devices. In most cases, <filename |
98 | -class="directory">/media</filename> is where most devices will be automounted. |
99 | +class="directory">/media</filename> is where most devices will be auto-mounted. |
100 | </para> |
101 | </listitem> |
102 | </varlistentry> |
103 | @@ -239,7 +238,7 @@ |
104 | <varlistentry><term><filename class="directory">selinux</filename></term> |
105 | <listitem> |
106 | <para> |
107 | -A pseudo-filesystem containing the commands used by the kernel subsystem for the |
108 | +A pseudo-filesystem containing the commands used by the kernel sub-system for the |
109 | Security-Enhanced Linux feature. |
110 | </para> |
111 | </listitem> |
112 | @@ -270,7 +269,7 @@ |
113 | <listitem> |
114 | <para> |
115 | Contains the largest share of data on the system, including read-only user |
116 | -data, as well as files and programs and such as program binaries, documentation, |
117 | +data, as well as files and programs, such as program binaries, documentation, |
118 | libraries, header files, and more. |
119 | </para> |
120 | </listitem> |
121 | @@ -278,7 +277,7 @@ |
122 | <varlistentry><term><filename class="directory">var</filename></term> |
123 | <listitem> |
124 | <para> |
125 | -Contains variable data such as system log files, mail and printer spool |
126 | +Contains variable data, such as system log files, mail and printer spool |
127 | directories, as well as transient and temporary files. |
128 | </para> |
129 | </listitem> |
130 | @@ -300,7 +299,7 @@ |
131 | Since Linux is a true multi-user system, the principles of both |
132 | <emphasis>users</emphasis> and <emphasis>groups</emphasis> are important to the |
133 | internal operation of the system, and also to the day-to-day use of the system. |
134 | -Linux handling of users and groups is the reason it is one of the most secure |
135 | +The way Linux handles users and groups makes it one of the most secure |
136 | operating systems. |
137 | </para> |
138 | <sect2 id="users"> |
139 | @@ -319,7 +318,7 @@ |
140 | <para> |
141 | <emphasis role="strong">Logical Users</emphasis> are not tied to a person, but |
142 | instead are tied to a system function that are used by applications to perform |
143 | -specific tasks. Daemons, mail, news are examples of logical users. |
144 | +specific tasks. Daemons, mail, and news are examples of logical users. |
145 | </para> |
146 | </listitem> |
147 | </itemizedlist> |
148 | @@ -328,9 +327,9 @@ |
149 | <title>Groups</title> |
150 | <para> |
151 | Groups are logical expressions of organization. They tie users together and |
152 | -provide group-based, rather than user-based permissions. Common groups |
153 | +provide group-based, rather than user-based, permissions. Common groups |
154 | include <emphasis>admin</emphasis>, |
155 | -<emphasis>audio</emphasis>, <emphasis>mail</emphasis>. |
156 | +<emphasis>audio</emphasis>, and <emphasis>mail</emphasis>. |
157 | </para> |
158 | </sect2> |
159 | </sect1> |
160 | @@ -417,8 +416,8 @@ |
161 | </entry> |
162 | <entry> |
163 | <emphasis role="strong">rwx</emphasis> - <emphasis>read</emphasis>, |
164 | -<emphasis>write</emphasis> and <emphasis>execute</emphasis> permissions for the |
165 | -user. |
166 | +<emphasis>write</emphasis>, and <emphasis>execute</emphasis> permissions |
167 | +for the user. |
168 | </entry> |
169 | <entry> |
170 | <emphasis role="strong">r-x</emphasis> - <emphasis>read</emphasis> and |
171 | @@ -503,7 +502,7 @@ |
172 | <listitem> |
173 | <para> |
174 | <keycombo><keycap>Ctrl</keycap><keycap>Esc</keycap></keycombo> - Starts |
175 | -&kde;' <application>s System Activity</application> dialog where processes |
176 | +&kde;'s <application>System Activity</application> dialog where processes |
177 | can be viewed and killed. |
178 | </para> |
179 | </listitem> |
180 | |
181 | === modified file 'docs/contribute/C/contribute.xml' |
182 | --- docs/contribute/C/contribute.xml 2011-09-14 10:02:12 +0000 |
183 | +++ docs/contribute/C/contribute.xml 2012-03-18 00:38:31 +0000 |
184 | @@ -9,11 +9,11 @@ |
185 | ]> |
186 | <article id="contribute"> |
187 | <articleinfo> |
188 | -<title>Contributing To The &kubuntu; Project</title> |
189 | +<title>Contributing To The Kubuntu Project</title> |
190 | &legalnotice; |
191 | <abstract> |
192 | <para> |
193 | -This document is about how you can help Kubuntu and get involved in the community. |
194 | +This document is about how you can help &kubuntu; and get involved in the community. |
195 | </para> |
196 | </abstract> |
197 | </articleinfo> |
198 | @@ -22,10 +22,12 @@ |
199 | <title>Introduction</title> |
200 | |
201 | <para> |
202 | -The Kubuntu community is individuals and teams working to package the software, test it, do bug triaging and then promoting Kubuntu to a wider audience. All of the software, artwork and documentation has been created, tested, |
203 | -used and discussed openly by people around the world participating in the Open Source |
204 | -community made possible by the Internet. So we invite you to help shape Kubuntu to better |
205 | -meet your needs. |
206 | +The &kubuntu; community is made up of individuals and teams working to package |
207 | +the software, test it, triage bugs, and then promote &kubuntu; to a wider |
208 | +audience. All of the software, artwork, and documentation has been created, |
209 | +tested, used, and discussed openly by people around the world participating in |
210 | +the Open Source community made possible by the Internet. We invite you to help |
211 | +shape &kubuntu; to better meet your needs. |
212 | </para> |
213 | </sect1> |
214 | |
215 | @@ -33,41 +35,53 @@ |
216 | <title> Spreading the word </title> |
217 | |
218 | <para> |
219 | -The easiest way to give back to the Kubuntu community is by sharing Kubuntu with others. Recommend |
220 | -Kubuntu to others, and show them how to download and install Kubuntu, and the possibilities and |
221 | -qualities of Open Source Software. As our community grows, it becomes more accepted and |
222 | -supported. Here are some of the steps you can take: |
223 | +The easiest way to give back to the &kubuntu; community is by sharing &kubuntu; |
224 | +with others. Recommend &kubuntu; to others, show them how to download and |
225 | +install it, and discuss the possibilities and qualities of Open Source Software |
226 | +with them. As our community grows, it becomes more accepted and supported. Here |
227 | +are some of the steps you can take: |
228 | </para> |
229 | <procedure> |
230 | <step> |
231 | <para> |
232 | -Give a talk at your local school, Linux User Group or library on Kubuntu. There are lots of |
233 | -notes from previous talks given by others in several languages available on the wiki. |
234 | -</para> |
235 | -</step> |
236 | -<step> |
237 | -<para> |
238 | -Get CDs by downloading the iso from <ulink url="http://www.kubuntu.org/getkubuntu/download">GetKubuntu</ulink> and then burn them (or create a LiveUSB) then distribute them to people who might be interested. Drop them off at libraries, Internet Cafes, schools, computer shops or anywhere else where people use computers. Please help people to use and understand Kubuntu if they approach you for help. |
239 | -</para> |
240 | -</step> |
241 | -<step> |
242 | -<para> |
243 | -Join or start a Local Community Team and discuss the possibilities that Kubuntu brings up. If you |
244 | -like Kubuntu it is likely that others around you will try it, and like it as well! See the "Going Local!" section for details. |
245 | +Give a talk on &kubuntu; at your local school, Linux User Group, or library. |
246 | +There are lots of notes from previous talks given by others in several |
247 | +languages available in the wiki. |
248 | +</para> |
249 | +</step> |
250 | +<step> |
251 | +<para> |
252 | +Get CDs by downloading the iso from <ulink |
253 | +url="http://www.kubuntu.org/getkubuntu/download">GetKubuntu</ulink> and burning |
254 | +it to blank CDs (or create a LiveUSB). Then distribute them to people who might |
255 | +be interested, drop them off at libraries, Internet cafes, schools, computer |
256 | +shops, or anywhere else where people use computers. Please help people to use |
257 | +and understand &kubuntu; if they approach you for help. |
258 | +</para> |
259 | +</step> |
260 | +<step> |
261 | +<para> |
262 | +Join or start a Local Community Team and discuss the possibilities that |
263 | +&kubuntu; brings up. If you like &kubuntu;, it is likely that others around you |
264 | +will try it and like it as well! |
265 | </para> |
266 | </step> |
267 | </procedure> |
268 | </sect1> |
269 | |
270 | <sect1 id="loco" status="complete"> |
271 | -<title> Local Teams </title> |
272 | +<title>Local Teams</title> |
273 | |
274 | <para> |
275 | -If you want to meet other Kubuntu users in your area, look for a Local Ubuntu Community team |
276 | -(LoCo team for short) to join. There are LoCo teams spread out all over the world, and you can find the directory <ulink url="http://loco.ubuntu.com/">here</ulink>. If there isn't a |
277 | -LoCo team near you, you can start a new one! Just follow the instructions <ulink url="https://wiki.ubuntu.com/LoCoTeamHowto"> on the wiki</ulink>. To get more |
278 | -information you can join your local LoCo Team mailing list and IRC channel. Details can be found on |
279 | -the LoCoTeam List wiki page. |
280 | +If you want to meet other &kubuntu; users in your area, look for a Local Ubuntu |
281 | +Community team (LoCo team for short) to join. There are LoCo teams spread out |
282 | +all over the world, and you can find the directory <ulink |
283 | +url="http://loco.ubuntu.com/">here</ulink>. If there isn't a LoCo team near |
284 | +you, you can start a new one! Just follow the instructions <ulink |
285 | +url="https://wiki.ubuntu.com/LoCoTeamHowto">on the wiki</ulink>. To get more |
286 | +information you can join your local LoCo Team mailing list and IRC channel. |
287 | +Details can be found on the <ulink |
288 | +url="http://loco.ubuntu.com/teams/">LoCoTeam List</ulink> wiki page. |
289 | </para> |
290 | </sect1> |
291 | |
292 | @@ -75,34 +89,44 @@ |
293 | <title> Translating Kubuntu </title> |
294 | |
295 | <para> |
296 | -If your home language is not English but you have excellent English skills and are |
297 | -comfortable using software in English, you help to translate the Kubuntu applications and documentation |
298 | -into your native language. To help out: |
299 | +If your home language is not English, but you have excellent English skills |
300 | +and are comfortable using software in English, you can help to translate the |
301 | +&kubuntu; applications and documentation into your native language. To help |
302 | +out: |
303 | </para> |
304 | <procedure> |
305 | <step> |
306 | <para> |
307 | -Using the web-based <ulink url="https://launchpad.net/ubuntu/+translations">Rosetta translation system</ulink> makes it easy to translate Ubuntu applications into your language. Even if you just translate a few lines you may |
308 | -make all the difference to someone in your own country who is just starting to learn about |
309 | +Using the web-based <ulink |
310 | +url="https://launchpad.net/ubuntu/+translations">Rosetta translation |
311 | +system</ulink> makes it easy to translate Ubuntu applications into your |
312 | +language. Even if you just translate a few lines you may make all the |
313 | +difference to someone in your own country who is just starting to learn about |
314 | computers and Free Software. |
315 | </para> |
316 | </step> |
317 | <step> |
318 | <para> |
319 | -Translate popular wiki pages within the <ulink url="https://help.ubuntu.com/community">Documentation Wiki</ulink>. |
320 | +Translate popular wiki pages within the <ulink |
321 | +url="https://help.ubuntu.com/community">Documentation Wiki</ulink>. |
322 | </para> |
323 | </step> |
324 | <step> |
325 | <para> |
326 | -Test that your local language fonts and display works correctly. If they don't, file bug |
327 | -reports on the issues. |
328 | +Test that your local language fonts and display work correctly. If they don't, |
329 | +file bug reports on the issues. For more information on filing bug reports, see |
330 | +<ulink type="help" url="help:/kubuntu/bugs/">Bugs</ulink>. |
331 | </para> |
332 | </step> |
333 | </procedure> |
334 | <para> |
335 | You can join your local LoCo Team mailing list and IRC channel (details can be |
336 | -found on <ulink url="https://wiki.ubuntu.com/LoCoTeams"> the LoCoTeam List wiki page</ulink>) to get in touch with other users in your region so you can |
337 | -coordinate your translation efforts. Also <ulink url="https://lists.ubuntu.com/mailman/listinfo/ubuntu-translators"> join the Ubuntu-Translators mailing list</ulink> to stay in touch with other Ubuntu translators. |
338 | +found on the <ulink url="https://wiki.ubuntu.com/LoCoTeams">LoCoTeam</ulink> |
339 | +wiki page) to get in touch with other users in your region so you can |
340 | +coordinate your translation efforts. Another option is to stay in touch with |
341 | +other Ubuntu translators by joining the <ulink |
342 | +url="https://lists.ubuntu.com/mailman/listinfo/ubuntu-translators">Ubuntu-Translators |
343 | +mailing list</ulink>. |
344 | </para> |
345 | </sect1> |
346 | |
347 | @@ -110,33 +134,49 @@ |
348 | <title> Writing Documentation </title> |
349 | |
350 | <para> |
351 | -If you get stumped by a problem, chances are that others might have had it or are currently |
352 | -experiencing it. If you are not currently able to write code to fix the problem, you can help everyone |
353 | -else out by documenting the solution. All documentation and help pages in Kubuntu are written by |
354 | -volunteer community members gathered in the Kubuntu Documentation Team, and you can help out in a number |
355 | -of ways: |
356 | +If you get stumped by a problem, chances are that others might have had it or |
357 | +are currently experiencing it. If you are not currently able to write code to |
358 | +fix the problem, you can help everyone else out by documenting the solution. |
359 | +All documentation and help pages in &kubuntu; are written by volunteer |
360 | +community members gathered in the Kubuntu Documentation Team, and you can help |
361 | +out in a number of ways: |
362 | </para> |
363 | <procedure> |
364 | <step> |
365 | <para> |
366 | -Check the existing documentation to see if it covers your problem. If it does, you can add to it, edit |
367 | -it or remove errors (such as typos, grammar and spelling, and technical errors), and send any suggestions |
368 | -and changes to the Documentation Team mailing list. For more information about how to help, see <ulink url="https://wiki.kubuntu.org/Kubuntu/Documentation">Kubuntu Documentation</ulink>. |
369 | -</para> |
370 | -</step> |
371 | -<step> |
372 | -<para> |
373 | -If no relevant documentation exists, you can add a page in the <ulink url="https://help.ubuntu.com/community"> Documentation Wiki</ulink> which is a separate community wiki for editing and writing documentation. Rather than answer a question two or more times, write up the answer and make it available to everyone in the wiki. |
374 | -</para> |
375 | -</step> |
376 | -<step> |
377 | -<para> |
378 | -Read through the documentation in the Ubuntu Forums and <ulink url="http://www.kubuntuforums.net/"> Kubuntuforum</ulink> and check them for accuracy, then put them in the Documentation Wiki. |
379 | +Check the existing documentation to see if it covers your problem. If it does, |
380 | +you can add to it, edit it, or remove errors (such as typos, grammar, spelling, |
381 | +and technical errors), and send any suggestions and changes to the |
382 | +Documentation Team mailing list. For more information about how to help, see |
383 | +<ulink url="https://wiki.kubuntu.org/Kubuntu/Documentation">Kubuntu |
384 | +Documentation</ulink>. |
385 | +</para> |
386 | +</step> |
387 | +<step> |
388 | +<para> |
389 | +If no relevant documentation exists, you can add a page in the <ulink |
390 | +url="https://help.ubuntu.com/community">Documentation Wiki</ulink>, which is a |
391 | +separate community wiki for editing and writing documentation. Rather than |
392 | +answer a question two or more times, write up the answer and make it available |
393 | +to everyone in the wiki. |
394 | +</para> |
395 | +</step> |
396 | +<step> |
397 | +<para> |
398 | +Read through the documentation in the <ulink |
399 | +url="http://ubuntuforums.org/">Ubuntu Forums</ulink> and <ulink |
400 | +url="http://www.kubuntuforums.net/">Kubuntu Forums</ulink> and check them for |
401 | +accuracy, then put them in the <ulink |
402 | +url="https://help.ubuntu.com/community">Documentation Wiki</ulink>. |
403 | </para> |
404 | </step> |
405 | </procedure> |
406 | <para> |
407 | -To get in touch with the Documentation Team you can <ulink url="http://lists.ubuntu.com/mailman/listinfo/ubuntu-doc"> join the Documentation team mailing list</ulink> and also the #ubuntu-doc IRC channel on irc.freenode.net. For Kubuntu Documentation specifically, please talk to Darkwingduck or jjesse in #kubuntu-devel, also on Freenode. |
408 | +To get in touch with the Documentation Team you can <ulink |
409 | +url="http://lists.ubuntu.com/mailman/listinfo/ubuntu-doc">join the |
410 | +Documentation team mailing list</ulink> and also the #ubuntu-doc IRC channel on |
411 | +irc.freenode.net. For Kubuntu Documentation, specifically, please talk to |
412 | +Darkwing or jjesse in #kubuntu-devel, also on irc.freenode.net. |
413 | </para> |
414 | </sect1> |
415 | </article> |
416 | |
417 | === modified file 'docs/manage-software/C/manage-software.xml' |
418 | --- docs/manage-software/C/manage-software.xml 2011-09-15 09:28:29 +0000 |
419 | +++ docs/manage-software/C/manage-software.xml 2012-03-18 00:38:31 +0000 |
420 | @@ -68,10 +68,10 @@ |
421 | add software repositories. |
422 | </para> |
423 | <para> |
424 | -The software that comprises &kubuntu; is being improved continuously. With an |
425 | +The software that comprises &kubuntu; is being continuously improved. With an |
426 | Internet connection and &kubuntu; software updating, the latest improvements and |
427 | -security fixes can be applied to a system easily. This document explains how to |
428 | -perform update. |
429 | +security fixes can easily be applied to a system. This document explains how to |
430 | +perform updates. |
431 | </para> |
432 | </sect1> |
433 | |
434 | @@ -88,58 +88,58 @@ |
435 | <para> |
436 | Install new software with the following steps: |
437 | </para> |
438 | + |
439 | <procedure> |
440 | <step> |
441 | <para> |
442 | -Start Muon with &menusysmuon;. |
443 | +Start <application>Muon</application> with &menusysmuon;. |
444 | </para> |
445 | </step> |
446 | - |
447 | <step> |
448 | <para> |
449 | Search for the application with the search box and filters at the top of the |
450 | window. |
451 | </para> |
452 | </step> |
453 | - |
454 | <step> |
455 | <para> |
456 | The application will show up in the large white space below the search area. |
457 | Click on the application title to be installed. |
458 | -Click <guilabel>Install</guilabel> to start the |
459 | -installation process. |
460 | +Click <guilabel>Install</guilabel> to start the installation process. |
461 | </para> |
462 | </step> |
463 | - |
464 | <step> |
465 | <para> |
466 | -Muon might provide information about required dependencies. Acknowledge |
467 | -this information, and the required packages will begin downloading. When the |
468 | -installation process is complete, the software will be ready to use. It is |
469 | -rarely necessary to restart the system after software installation or update. |
470 | +<application>Muon</application> might provide information about required |
471 | +dependencies. Once this information is acknowledged, the required packages will |
472 | +begin downloading. When the installation process is complete, the software will |
473 | +be ready to use. It is rarely necessary to restart the system after software |
474 | +installation or updates. |
475 | </para> |
476 | </step> |
477 | </procedure> |
478 | + |
479 | <para> |
480 | -Muon provides an easy method to remove the software that is no longer |
481 | -needed. To remove an application: |
482 | +<application>Muon</application> provides an easy method to remove the software |
483 | +that is no longer needed. To remove an application: |
484 | </para> |
485 | + |
486 | <procedure> |
487 | <step> |
488 | <para> |
489 | -Start Muon with &menusysmuon;. |
490 | -</para> |
491 | -</step> |
492 | - |
493 | -<step> |
494 | -<para> |
495 | -Click on <guimenu>Installed Software</guimenu> and find the application you want removed. |
496 | -</para> |
497 | -</step> |
498 | - |
499 | -<step> |
500 | -<para> |
501 | -Click <guilabel>Remove</guilabel> and Muon will remove the application. |
502 | +Start <application>Muon</application> with &menusysmuon;. |
503 | +</para> |
504 | +</step> |
505 | +<step> |
506 | +<para> |
507 | +Click on <guimenu>Installed Software</guimenu> and find the application you |
508 | +want to remove. |
509 | +</para> |
510 | +</step> |
511 | +<step> |
512 | +<para> |
513 | +Click <guilabel>Remove</guilabel> and <application>Muon</application> will |
514 | +remove the application. |
515 | </para> |
516 | </step> |
517 | </procedure> |
518 | @@ -151,7 +151,7 @@ |
519 | |
520 | <para> |
521 | <application><acronym>APT</acronym></application> (Advanced Packaging Tool) is a |
522 | -powerful package management system, which is the basis for the graphical |
523 | +powerful package management system which is the basis for the graphical |
524 | <application>Software Management</application> application. |
525 | <application>APT</application> automatically handles dependencies and performs |
526 | other package operations that are required for package installation. |
527 | @@ -160,7 +160,7 @@ |
528 | <para> |
529 | Running <application>APT</application> requires administrative privileges. |
530 | Entering commands with "sudo" generates a password prompt. Several of the |
531 | -commands below will not run without sudo. |
532 | +commands below will not run without sudo. |
533 | </para> |
534 | </note> |
535 | <para> |
536 | @@ -193,7 +193,7 @@ |
537 | </listitem> |
538 | <listitem> |
539 | <para> |
540 | -Retrieve the current lists of available packages: |
541 | +Retrieve the current list of available packages: |
542 | <screen>sudo apt-get update</screen> |
543 | </para> |
544 | </listitem> |
545 | @@ -216,7 +216,6 @@ |
546 | the comprehensive <ulink url="&debian-apt;">Debian APT User Manual</ulink>. |
547 | </para> |
548 | </tip> |
549 | - |
550 | </sect1> |
551 | |
552 | <!-- APTITUDE --> |
553 | @@ -226,7 +225,7 @@ |
554 | <para> |
555 | <application>Aptitude</application> is a command line front-end to |
556 | <application>APT</application>. <application>Aptitude</application> allows |
557 | -for interactive package selection to remove, update or install packages. |
558 | +for interactive package selection to remove, update, or install packages. |
559 | <application>Aptitude</application> is an advanced package management system, |
560 | with more control and capability than <application>APT</application> as a |
561 | command line tool. |
562 | @@ -239,12 +238,11 @@ |
563 | |
564 | <para> |
565 | Although the preferred method of installing programs is with the package |
566 | -manager, individual software |
567 | -package files can be downloaded and installed. Several kinds of package files |
568 | -are available for Linux systems. Generally, these file types are associated with |
569 | -the package managers of specific Linux distributions. |
570 | +manager, individual software package files can be downloaded and installed. |
571 | +Several kinds of package files are available for Linux systems. Generally, |
572 | +these file types are associated with the package managers of specific Linux |
573 | +distributions. |
574 | </para> |
575 | - |
576 | <para> |
577 | To install a particular application, it is preferable to select a &kubuntu; |
578 | package of the application, and install it with a package manager. This ensures |
579 | @@ -272,20 +270,20 @@ |
580 | |
581 | <sect2 id="alien" status="complete"> |
582 | <title>Convert .rpm files to .deb files</title> |
583 | - |
584 | + |
585 | <para> |
586 | Red Hat Package Manager files have the <emphasis>.rpm</emphasis> |
587 | -suffix. It is not recommended that these be installed on a &kubuntu; system. In |
588 | -almost all cases, a native &kubuntu; <emphasis>.deb</emphasis> version of |
589 | -the package is available. However, if necessary, an <emphasis>.rpm</emphasis> |
590 | -file can be converted to a <emphasis>.deb</emphasis> package using a program |
591 | -called <application>alien</application>. |
592 | +suffix. Installing these on a &kubuntu; system is not recommended. In almost |
593 | +all cases, a native &kubuntu; <emphasis>.deb</emphasis> version of the package |
594 | +is available. However, if necessary, an <emphasis>.rpm</emphasis> file can be |
595 | +converted to a <emphasis>.deb</emphasis> package by using a program called |
596 | +<application>alien</application>. |
597 | </para> |
598 | <procedure> |
599 | <title>Installing Alien</title> |
600 | <step> |
601 | <para> |
602 | -Open <application>Software Center</application> by going to &menusysmuon;. |
603 | +Open <application>Muon</application> by going to &menumuon;. |
604 | </para> |
605 | </step> |
606 | <step> |
607 | @@ -297,30 +295,35 @@ |
608 | <step> |
609 | <para> |
610 | Locate the package named <application>alien</application> and |
611 | -select it. Press the <guibutton>down arrow</guibutton> button. The arrow will |
612 | -change color. |
613 | -</para> |
614 | -</step> |
615 | - |
616 | -<step> |
617 | -<para> |
618 | -Press the <guibutton>Apply</guibutton> button, and |
619 | -the <guibutton>Install Now</guibutton> button on the following screen. There |
620 | -may be additional packages required to be installed as dependencies. If so, |
621 | -click <guibutton>OK</guibutton>. |
622 | -</para> |
623 | -</step> |
624 | - |
625 | +select it. Press the <guibutton>Installation</guibutton> button near the |
626 | +bottom right of the window. |
627 | +</para> |
628 | +<note> |
629 | +<para> |
630 | +The text in the <emphasis>Requested</emphasis> column will turn green and |
631 | +change from <quote>No Change</quote> to <quote>Install</quote>. |
632 | +</para> |
633 | +</note> |
634 | +</step> |
635 | +<step> |
636 | +<para> |
637 | +Additional packages may be required as dependencies. If so, a list will be |
638 | +displayed. Click the <guibutton>OK</guibutton> button to mark them for |
639 | +installation. |
640 | +</step> |
641 | +<step> |
642 | +<para> |
643 | +Press the <guibutton>Apply Changes</guibutton> button in the toolbar. |
644 | +</para> |
645 | +</step> |
646 | <step> |
647 | <para> |
648 | If prompted, enter the proper password and press <guibutton>OK</guibutton>. |
649 | </para> |
650 | </step> |
651 | - |
652 | <step> |
653 | <para> |
654 | -Once the installation has completed, close <application>Software |
655 | -Management</application>. |
656 | +Once the installation has completed, close <application>Muon</application>. |
657 | </para> |
658 | </step> |
659 | </procedure> |
660 | @@ -334,13 +337,14 @@ |
661 | <step> |
662 | <para> |
663 | At the command prompt, type <userinput>sudo alien package_file.rpm</userinput> |
664 | -and press the <keycap>Enter</keycap> key. |
665 | +and press the <keycap>Enter</keycap> key to create a <emphasis>.deb</emphasis> |
666 | +file in the same directory. |
667 | </para> |
668 | </step> |
669 | <step> |
670 | <para> |
671 | For more information on <application>alien</application>, type <userinput>man |
672 | -alien</userinput> at the command prompt. When complete, press |
673 | +alien</userinput> at the command prompt. When finished, press |
674 | <keycap>q</keycap> to exit. |
675 | </para> |
676 | </step> |
677 | @@ -353,12 +357,12 @@ |
678 | <para> |
679 | Files with the <emphasis>.tar.gz</emphasis> or <emphasis>.tar.bz2</emphasis> |
680 | suffix are package files known as <emphasis>tarballs</emphasis> or |
681 | -<emphasis>source</emphasis> packages which are widely used in Linux. If there is |
682 | -no native &kubuntu; package available in any of the repositories, it may be |
683 | +<emphasis>source</emphasis> packages. These are widely used in Linux. If there |
684 | +is no native &kubuntu; package available in any of the repositories, it may be |
685 | possible to compile and install the package from source. For tips on compiling |
686 | -software, look at the <ulink |
687 | -url="https://wiki.ubuntu.com/CompilingSoftware">Compiling |
688 | -Software</ulink> page on the Ubuntu Wiki. |
689 | +software, look at the <ulink |
690 | +url="https://wiki.ubuntu.com/CompilingSoftware">Compiling Software</ulink> page |
691 | +in the Ubuntu Wiki. |
692 | </para> |
693 | </sect2> |
694 | </sect1> |
695 | @@ -371,12 +375,12 @@ |
696 | <title>What are Repositories?</title> |
697 | |
698 | <para> |
699 | -Thousands of programs are freely available to install on &kubuntu;. These |
700 | +Thousands of programs are freely available to install in &kubuntu;. These |
701 | programs are stored in software archives (<emphasis>repositories</emphasis>) and |
702 | are made available for installation over the Internet. This makes it easy |
703 | -to install new programs in &kubuntu;. It is also secure, because each |
704 | -program is built specifically for &kubuntu; and is checked thoroughly before it |
705 | -is installed. &kubuntu; repositories are categorized into four groups: |
706 | +to install new programs in &kubuntu;. It is also secure, because each program |
707 | +is built specifically for &kubuntu; and is checked thoroughly before it is |
708 | +installed. &kubuntu; repositories are categorized into four groups: |
709 | </para> |
710 | |
711 | <itemizedlist> |
712 | @@ -391,13 +395,13 @@ |
713 | <itemizedlist> |
714 | <listitem> |
715 | <para> |
716 | -The level of support that software development teams provide for a program |
717 | +The level of support that software development teams provide for a program. |
718 | </para> |
719 | </listitem> |
720 | <listitem> |
721 | <para> |
722 | The level of compliance the program has to the <ulink |
723 | -url="&ubuntu-philosophy;">Free Software Philosophy</ulink> |
724 | +url="&ubuntu-philosophy;">Free Software Philosophy</ulink>. |
725 | </para> |
726 | </listitem> |
727 | </itemizedlist> |
728 | @@ -411,7 +415,7 @@ |
729 | a system has information about the Internet-based locations for these |
730 | repositories, more programs are available for installation. Using the |
731 | software package management tools installed by default, it is possible to |
732 | -discover, install and update any piece of software directly over the Internet, |
733 | +discover, install, and update any piece of software directly over the Internet |
734 | without the need for the LiveCD. |
735 | </para> |
736 | </sect2> |
737 | @@ -431,7 +435,7 @@ |
738 | <guimenu>Settings</guimenu> |
739 | <guimenuitem>Configure Software Sources</guimenuitem> |
740 | </menuchoice> |
741 | - in the <application>Software Center</application> package manager window. |
742 | + in the <application>Muon</application> package manager window. |
743 | </para> |
744 | </step> |
745 | <step> |
746 | @@ -439,13 +443,12 @@ |
747 | An administrative password is required in order to proceed. |
748 | </para> |
749 | </step> |
750 | - |
751 | <step> |
752 | <para> |
753 | Next, click on the <guilabel>Other Software</guilabel> tab. Existing |
754 | repositories can be enabled or disabled by checking the appropriate boxes |
755 | -in the upper section. To add a new repository, click the |
756 | -<guilabel>Add</guilabel> button. |
757 | +in the upper section. To add a new repository, click the |
758 | +<guilabel>Add...</guilabel> button. |
759 | </para> |
760 | </step> |
761 | |
762 | @@ -453,24 +456,41 @@ |
763 | <para> |
764 | Enter the repository address. The proper format is required, and looks similar |
765 | to this: |
766 | -<screen>deb http://ppa.launchpad.net/kubuntu-ppa/backports/ubuntu |
767 | -oneiric main</screen> |
768 | -</para> |
769 | -</step> |
770 | - |
771 | -<step> |
772 | -<para> |
773 | -After adding the repository, a prompt will appear to update the package list. |
774 | -This will allow Muon to find the newly available software. |
775 | -</para> |
776 | +<screen>deb http://ppa.launchpad.net/kubuntu-ppa/backports/ubuntu oneiric |
777 | +main</screen> |
778 | +</para> |
779 | +</step> |
780 | + |
781 | +<step> |
782 | +<para> |
783 | +Click the <guilabel>OK</guilabel> button to add the repository. |
784 | +</para> |
785 | +</step> |
786 | + |
787 | +<step> |
788 | +<para> |
789 | +Click the <guilabel>Close</guilabel> button. |
790 | +</para> |
791 | +<note> |
792 | +<para> |
793 | +A prompt will appear to update the package list. Doing so will allow |
794 | +<application>Muon</application> to find the newly available software. |
795 | +</para> |
796 | +</note> |
797 | </step> |
798 | |
799 | <step> |
800 | <para> |
801 | To remove a repository, select it in <guilabel>Software Sources</guilabel>, and |
802 | -press the <guibutton>Remove</guibutton> button. When the process is |
803 | -complete, press the <guibutton>Close</guibutton> button. |
804 | -</para> |
805 | +press the <guibutton>Remove</guibutton> button. When the process is complete, |
806 | +press the <guibutton>Close</guibutton> button. |
807 | +</para> |
808 | +<note> |
809 | +<para> |
810 | +A prompt will appear to update the package list. Doing so will make |
811 | +<application>Muon</application> forget the no longer available software. |
812 | +</para> |
813 | +</note> |
814 | </step> |
815 | </procedure> |
816 | </sect2> |
817 | @@ -488,9 +508,9 @@ |
818 | <para> |
819 | When updates become available, &kubuntu; will display a message in the System |
820 | Tray. To update the system, click the <guibutton>Review and Update</guibutton> |
821 | -button, which will open Muon. Click <guibutton>Select All |
822 | -Updates</guibutton> and then <guibutton>Apply</guibutton>. &kubuntu; will |
823 | -download and install the updates. |
824 | +button, which will open <application>Muon</application>. Click |
825 | +<guibutton>Select All Updates</guibutton> and then <guibutton>Apply</guibutton>. |
826 | +&kubuntu; will download and install the updates. |
827 | </para> |
828 | |
829 | <para> |
Thanks of rthe changes and the merge request. Please continue to do so. Merging this request