aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/psmisc-desc.xml8
-rw-r--r--appendixa/shadowpwd-desc.xml6
-rw-r--r--appendixa/shellutils-desc.xml14
-rw-r--r--appendixa/sysvinit-desc.xml4
-rw-r--r--chapter06/glibc-exp.xml6
-rw-r--r--chapter06/pwdgroup.xml18
-rw-r--r--chapter07/usage.xml2
7 files changed, 30 insertions, 28 deletions
diff --git a/appendixa/psmisc-desc.xml b/appendixa/psmisc-desc.xml
index 76aabf053..41f0e2962 100644
--- a/appendixa/psmisc-desc.xml
+++ b/appendixa/psmisc-desc.xml
@@ -9,16 +9,16 @@ because we use pidof from sysvinit instead.</para></sect3>
<sect3><title>Descriptions</title>
<sect4><title>fuser</title>
-<para>fuser displays the PIDs of processes using the specified files or file
-systems.</para></sect4>
+<para>fuser displays the PIDs of processes that use the specified
+files or file systems.</para></sect4>
<sect4><title>killall</title>
<para>killall sends a signal to all processes running any of the specified
commands.</para></sect4>
<sect4><title>pidof</title>
-<para>pidof finds the process id's (pids) of the named programs and
-prints those id's on standard output.</para></sect4>
+<para>pidof displays the process identifiers (PIDs) of the named
+programs.</para></sect4>
<sect4><title>pstree</title>
<para>pstree shows running processes as a tree.</para></sect4>
diff --git a/appendixa/shadowpwd-desc.xml b/appendixa/shadowpwd-desc.xml
index 539fa79e1..41acee519 100644
--- a/appendixa/shadowpwd-desc.xml
+++ b/appendixa/shadowpwd-desc.xml
@@ -107,9 +107,9 @@ files.</para></sect4>
<para>sg executes command as a different group ID.</para></sect4>
<sect4><title>su</title>
-<para>su changes the effective user id and group id to that of a given user.
-This replaces the su programs that's installed from the
-Sh-utils package.</para></sect4>
+<para>su changes the effective user and group IDs to that of a given user.
+(This program replaces the su program installed from the
+Sh-utils package.)</para></sect4>
<sect4><title>useradd</title>
<para>useradd creates a new user or update default new user
diff --git a/appendixa/shellutils-desc.xml b/appendixa/shellutils-desc.xml
index 22b0af71d..ac9da10ec 100644
--- a/appendixa/shellutils-desc.xml
+++ b/appendixa/shellutils-desc.xml
@@ -47,11 +47,11 @@ integer numbers.</para></sect4>
host.</para></sect4>
<sect4><title>hostname</title>
-<para>hostname sets or prints the name of the current host system.</para></sect4>
+<para>hostname prints or sets the name of the current host system.</para></sect4>
<sect4><title>id</title>
-<para>id prints the real and effective UIDs and GIDs of a user or the current
-user.</para></sect4>
+<para>id prints the effective user and group IDs of the current
+user or a given user.</para></sect4>
<sect4><title>logname</title>
<para>logname prints the current user's login name.</para></sect4>
@@ -91,7 +91,7 @@ increment.</para></sect4>
<para>stty changes and prints terminal line settings.</para></sect4>
<sect4><title>su</title>
-<para>su runs a shell with substitute user and group ID's.</para></sect4>
+<para>su runs a shell with substitute user and group IDs.</para></sect4>
<sect4><title>tee</title>
<para>tee reads from standard input and writes to standard output and
@@ -121,10 +121,12 @@ current host.</para></sect4>
<para>who shows who is logged on.</para></sect4>
<sect4><title>whoami</title>
-<para>whoami prints the user's effective userid.</para></sect4>
+<para>whoami prints the user name associated with the current
+effective user ID.</para></sect4>
<sect4><title>yes</title>
-<para>yes outputs a string repeatedly until killed.</para></sect4>
+<para>yes outputs 'y' or a given string repeatedly,
+until killed.</para></sect4>
</sect3>
diff --git a/appendixa/sysvinit-desc.xml b/appendixa/sysvinit-desc.xml
index adccb6fab..607d227ef 100644
--- a/appendixa/sysvinit-desc.xml
+++ b/appendixa/sysvinit-desc.xml
@@ -41,8 +41,8 @@ file /var/log/btmp, which contains all the bad login attempts.</para></sect4>
used to allow or disallow other users to write to his terminal.</para></sect4>
<sect4><title>pidof</title>
-<para>pidof finds the process id's (pids) of the named programs and prints
-those id's on standard output.</para></sect4>
+<para>pidof displays the process identifiers (PIDs) of the named
+programs.</para></sect4>
<sect4><title>poweroff</title>
<para>poweroff is equivalent to shutdown -h -p now. It halts the computer and
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index 1acd57137..bd2bab1d2 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -19,9 +19,9 @@ it hasn't been installed yet.</para>
<para><userinput>sed 's/root/0' login/Makefile.backup &gt;
login/Makefile:</userinput> This sed command replaces all occurrences of
<filename>root</filename> in <filename>login/Makefile.backup</filename>
-with 0. This is because we don't have glibc on the LFS system yet, so
-usernames can't be resolved to their user id's. Therefore, we replace
-the username root with user id 0.</para>
+with 0. This is necessary because we don't have glibc on the LFS system yet, so
+user names can't be resolved to their user IDs. Therefore, we replace
+the user name "root" with user ID 0.</para>
<para><userinput>--enable-add-ons:</userinput> This enables the add-on that
we install with Glibc: linuxthreads</para>
diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml
index 942281c2b..bf2f0315d 100644
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@@ -2,15 +2,15 @@
<title>Creating passwd and group files</title>
<?dbhtml filename="pwdgroup.html" dir="chapter06"?>
-<para>In order for the user and group root to be recognized and to be able to
-login, there needs to be an entry in the /etc/passwd and /etc/group file.
-Besides the group root, a couple of other groups are recommended and needed by
-packages. The groups created below aren't part of any standard.
-The LSB only recommends a group bin with GID 1 to be present besides
-group root. Other group names and GID's can be chosen by the user. Well
-written packages don't depend on GID numbers but just use the group
-name, so it doesn't matter which GID a group has. Since there
-aren't any standards for groups the groups created here are the groups the
+<para>In order for the user and the group "root" to be recognized and to be
+able to login, there need to be entries in the /etc/passwd and /etc/group file.
+Besides the group "root", a couple of other groups are recommended or needed
+by some packages. The groups created below aren't part of any standard.
+The LSB only recommends a group "bin" with GID 1 to be present besides
+"root". Other group names and GIDs can be chosen by the user.
+Well-written packages don't depend on GID numbers, but use the group's
+name; so it doesn't matter which GID a group has. Since there
+aren't any standards for groups, the groups created here are the groups the
MAKEDEV script (the script that creates the device files in the /dev
directory) mentions.</para>
diff --git a/chapter07/usage.xml b/chapter07/usage.xml
index 00bbacd32..9fb37f6cd 100644
--- a/chapter07/usage.xml
+++ b/chapter07/usage.xml
@@ -76,7 +76,7 @@ This is used after the configuration file of a service was modified, when
the service doesn't need to be restarted.</para></listitem>
<listitem><para><emphasis>status</emphasis>: Tells if the service
-is running and with which PID's.</para></listitem>
+is running and with which PIDs.</para></listitem>
</itemizedlist>