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

Proposed by Little Girl
Status: Merged
Merged at revision: 260
Proposed branch: lp:~littlergirl/kubuntu-docs/basics
Merge into: lp:kubuntu-docs/precise
Diff against target: 179 lines (+27/-28)
1 file modified
docs/basics/C/basics.xml (+27/-28)
To merge this branch: bzr merge lp:~littlergirl/kubuntu-docs/basics
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+98036@code.launchpad.net

Description of the change

* A few grammar and punctuation changes to the basics.xml file.

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
=== modified file 'docs/basics/C/basics.xml'
--- docs/basics/C/basics.xml 2011-09-14 08:01:10 +0000
+++ docs/basics/C/basics.xml 2012-03-17 02:47:18 +0000
@@ -40,19 +40,18 @@
40</para>40</para>
41</note>41</note>
42<para>42<para>
43A filesystem is a method of storing and organizing files, not only in Linux43A filesystem is a method of storing and organizing files &mdash; not only in
44but also in other computer operating systems. In Linux, most files are44Linux, but also in other computer operating systems. In Linux, most files are
45<quote>regular files</quote>, except <emphasis>directories</emphasis>,45<quote>regular files</quote>, except <emphasis>directories</emphasis>,
46<emphasis>special files</emphasis>, <emphasis>links</emphasis>,46<emphasis>special files</emphasis>, <emphasis>links</emphasis>,
47<emphasis>sockets</emphasis>, and <emphasis>named pipes</emphasis>. The most47<emphasis>sockets</emphasis>, and <emphasis>named pipes</emphasis>. The most
48common filetypes that users interact with are regular files, directories and48common filetypes that users interact with are regular files, directories, and
49links.49links.
50</para>50</para>
51<para>51<para>
52Opening a terminal (in &kubuntu; this is52Opening a terminal (in &kubuntu; this is called
53called <application>Konsole</application>) and typing53<application>Konsole</application>) and typing
54<screen>ls /</screen>54<screen>ls /</screen> brings up a list similar to the following:
55brings up a list similar to the following:
56<screen>55<screen>
57bin56bin
58boot57boot
@@ -114,10 +113,10 @@
114<para>113<para>
115A <abbrev>symlink</abbrev> or <quote>symbolic link</quote> to <filename114A <abbrev>symlink</abbrev> or <quote>symbolic link</quote> to <filename
116class="directory">/media/cdrom</filename>, which itself is a115class="directory">/media/cdrom</filename>, which itself is a
117<abbrev>symlink</abbrev> to <filename116<abbrev>symlink</abbrev> to <filename
118class="directory">/media/cdrom0</filename>. If a <acronym>CD</acronym> is placed117class="directory">/media/cdrom0</filename>. If a <acronym>CD</acronym> is placed
119into the <acronym>CDROM</acronym> drive, the contents of that CD will be118into the <acronym>CDROM</acronym> drive, the contents of that CD will be
120available in <filename class="directory">/media/cdrom0</filename> directory.119available in the <filename class="directory">/media/cdrom0</filename> directory.
121</para>120</para>
122</listitem>121</listitem>
123</varlistentry>122</varlistentry>
@@ -133,8 +132,8 @@
133<varlistentry><term><filename class="directory">etc</filename></term>132<varlistentry><term><filename class="directory">etc</filename></term>
134<listitem>133<listitem>
135<para>134<para>
136Contains all system-related configuration files, used to control135Contains all system-related configuration files used to control the
137the operation of programs.136operation of programs.
138</para>137</para>
139</listitem>138</listitem>
140</varlistentry>139</varlistentry>
@@ -142,8 +141,8 @@
142<listitem>141<listitem>
143<para>142<para>
144Contains a home directory for each user on the system. A user's home directory143Contains a home directory for each user on the system. A user's home directory
145can contain personal configuration files and files such as documents, music,144can contain personal configuration files, documents, music, videos, and other
146video, and other user-defined directories and files.145user-defined directories and files.
147</para>146</para>
148</listitem>147</listitem>
149</varlistentry>148</varlistentry>
@@ -158,8 +157,8 @@
158<varlistentry><term><filename class="directory">lib</filename></term>157<varlistentry><term><filename class="directory">lib</filename></term>
159<listitem>158<listitem>
160<para>159<para>
161Contains the kernel modules in addition to shared library images needed to boot160Contains the kernel modules and shared library images needed to boot the
162the system and run commands.161system and run commands.
163</para>162</para>
164</listitem>163</listitem>
165</varlistentry>164</varlistentry>
@@ -182,7 +181,7 @@
182<varlistentry><term><filename class="directory">lost+found</filename></term>181<varlistentry><term><filename class="directory">lost+found</filename></term>
183<listitem>182<listitem>
184<para>183<para>
185Contains the results of any recovery operation due to an improper shutdown of184Contains the results of any recovery operation due to an improper shut-down of
186the system or a system crash.185the system or a system crash.
187</para>186</para>
188</listitem>187</listitem>
@@ -190,7 +189,7 @@
190<varlistentry><term><filename class="directory">media</filename></term>189<varlistentry><term><filename class="directory">media</filename></term>
191<listitem>190<listitem>
192<para>191<para>
193Contains the subdirectories which are used as mount points for removable media192Contains the subdirectories which are used as mount points for removable media,
194such as <acronym>CDROM</acronym> drives, <acronym>USB</acronym> disks, floppy193such as <acronym>CDROM</acronym> drives, <acronym>USB</acronym> disks, floppy
195disks.194disks.
196</para>195</para>
@@ -200,7 +199,7 @@
200<listitem>199<listitem>
201<para>200<para>
202Generic mount point for filesystems or devices. In most cases, <filename201Generic mount point for filesystems or devices. In most cases, <filename
203class="directory">/media</filename> is where most devices will be automounted.202class="directory">/media</filename> is where most devices will be auto-mounted.
204</para>203</para>
205</listitem>204</listitem>
206</varlistentry>205</varlistentry>
@@ -239,7 +238,7 @@
239<varlistentry><term><filename class="directory">selinux</filename></term>238<varlistentry><term><filename class="directory">selinux</filename></term>
240<listitem>239<listitem>
241<para>240<para>
242A pseudo-filesystem containing the commands used by the kernel subsystem for the241A pseudo-filesystem containing the commands used by the kernel sub-system for the
243Security-Enhanced Linux feature.242Security-Enhanced Linux feature.
244</para>243</para>
245</listitem>244</listitem>
@@ -270,7 +269,7 @@
270<listitem>269<listitem>
271<para>270<para>
272Contains the largest share of data on the system, including read-only user271Contains the largest share of data on the system, including read-only user
273data, as well as files and programs and such as program binaries, documentation,272data, as well as files and programs, such as program binaries, documentation,
274libraries, header files, and more.273libraries, header files, and more.
275</para>274</para>
276</listitem>275</listitem>
@@ -278,7 +277,7 @@
278<varlistentry><term><filename class="directory">var</filename></term>277<varlistentry><term><filename class="directory">var</filename></term>
279<listitem>278<listitem>
280<para>279<para>
281Contains variable data such as system log files, mail and printer spool280Contains variable data, such as system log files, mail and printer spool
282directories, as well as transient and temporary files.281directories, as well as transient and temporary files.
283</para>282</para>
284</listitem>283</listitem>
@@ -300,7 +299,7 @@
300Since Linux is a true multi-user system, the principles of both299Since Linux is a true multi-user system, the principles of both
301<emphasis>users</emphasis> and <emphasis>groups</emphasis> are important to the300<emphasis>users</emphasis> and <emphasis>groups</emphasis> are important to the
302internal operation of the system, and also to the day-to-day use of the system.301internal operation of the system, and also to the day-to-day use of the system.
303Linux handling of users and groups is the reason it is one of the most secure302The way Linux handles users and groups makes it one of the most secure
304operating systems.303operating systems.
305</para>304</para>
306<sect2 id="users">305<sect2 id="users">
@@ -319,7 +318,7 @@
319<para>318<para>
320<emphasis role="strong">Logical Users</emphasis> are not tied to a person, but319<emphasis role="strong">Logical Users</emphasis> are not tied to a person, but
321instead are tied to a system function that are used by applications to perform320instead are tied to a system function that are used by applications to perform
322specific tasks. Daemons, mail, news are examples of logical users.321specific tasks. Daemons, mail, and news are examples of logical users.
323</para>322</para>
324</listitem>323</listitem>
325</itemizedlist>324</itemizedlist>
@@ -328,9 +327,9 @@
328<title>Groups</title>327<title>Groups</title>
329<para>328<para>
330Groups are logical expressions of organization. They tie users together and329Groups are logical expressions of organization. They tie users together and
331provide group-based, rather than user-based permissions. Common groups330provide group-based, rather than user-based, permissions. Common groups
332include <emphasis>admin</emphasis>,331include <emphasis>admin</emphasis>,
333<emphasis>audio</emphasis>, <emphasis>mail</emphasis>.332<emphasis>audio</emphasis>, and <emphasis>mail</emphasis>.
334</para>333</para>
335</sect2>334</sect2>
336</sect1>335</sect1>
@@ -417,8 +416,8 @@
417</entry>416</entry>
418<entry>417<entry>
419<emphasis role="strong">rwx</emphasis> - <emphasis>read</emphasis>,418<emphasis role="strong">rwx</emphasis> - <emphasis>read</emphasis>,
420<emphasis>write</emphasis> and <emphasis>execute</emphasis> permissions for the419<emphasis>write</emphasis>, and <emphasis>execute</emphasis> permissions
421user.420for the user.
422</entry>421</entry>
423<entry>422<entry>
424<emphasis role="strong">r-x</emphasis> - <emphasis>read</emphasis> and423<emphasis role="strong">r-x</emphasis> - <emphasis>read</emphasis> and
@@ -503,7 +502,7 @@
503<listitem>502<listitem>
504<para>503<para>
505<keycombo><keycap>Ctrl</keycap><keycap>Esc</keycap></keycombo> - Starts504<keycombo><keycap>Ctrl</keycap><keycap>Esc</keycap></keycombo> - Starts
506&kde;&apos; <application>s System Activity</application> dialog where processes505&kde;&apos;s <application>System Activity</application> dialog where processes
507can be viewed and killed.506can be viewed and killed.
508</para>507</para>
509</listitem>508</listitem>

Subscribers

People subscribed via source and target branches

to all changes: