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
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-17 02:47:18 +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 &mdash; 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;&apos; <application>s System Activity</application> dialog where processes
176+&kde;&apos;s <application>System Activity</application> dialog where processes
177 can be viewed and killed.
178 </para>
179 </listitem>

Subscribers

People subscribed via source and target branches

to all changes: