Package: debian-handbook
Version: 6.0+20120509
Severity: minor
Tags: patch
Here are a whole bunch of spelling fixes I caught with aspell. This
patch is against the Git repository at commit 92c652df.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-- no debconf information
--- a/en-US/00b_foreword.xml
+++ b/en-US/00b_foreword.xml
@@ -90,7 +90,7 @@
<para>Users of another Linux distribution, or of another Unix variant,
will discover the specifics of Debian, and should become operational
- very quickly while benefitting fully from the unique advantages of this
+ very quickly while benefiting fully from the unique advantages of this
distribution.</para>
<para>Finally, readers who already have some knowledge of Debian and
--- a/en-US/01_the-debian-project.xml
+++ b/en-US/01_the-debian-project.xml
@@ -623,7 +623,7 @@
has remained strongly attached to Debian, since he continues to
promote this distribution in political and economic spheres. He
still sporadically appears on the e-mail lists to give his advice
- and present his latests initiatives in favor of Debian.</para>
+ and present his latest initiatives in favor of Debian.</para>
<indexterm><primary>codename</primary></indexterm>
<indexterm><primary>name</primary><secondary>codename</secondary></indexterm>
<indexterm><primary><emphasis role="distribution">Rex</emphasis></primary></indexterm>
--- a/en-US/04_installation.xml
+++ b/en-US/04_installation.xml
@@ -355,7 +355,7 @@
<para>Once booted, the installation program guides you step by step
throughout the process. This section presents each of these steps in
detail. Here we follow the process of an installation from a
- Multi-Arch DVD-ROM; other types of installlations,
+ Multi-Arch DVD-ROM; other types of installations,
(<emphasis>netinst</emphasis> or <emphasis>businesscard</emphasis>)
may be slightly different. We will also address installation in
graphical mode, but this differs from “classic” installation only
@@ -1265,7 +1265,7 @@
actually be made of the machine. As such, you might want to use a
package management tool to refine the selection of installed
packages. The two most frequently used tools (which are installed if
- the “Graphical desktop enviroment” profile was chosen) are
+ the “Graphical desktop environment” profile was chosen) are
<command>apt</command> (accessible from the command line) and
<command>synaptic</command> (<menuchoice><guimenu>System</guimenu>
<guisubmenu>Administration</guisubmenu> <guimenuitem>Synaptic Package
--- a/en-US/05_packaging-system.xml
+++ b/en-US/05_packaging-system.xml
@@ -673,7 +673,7 @@ Tag: admin::package-management, hardware::storage, hardware::storage:cd, interfa
prior to installation of the package, while the
<filename>postinst</filename> follows it. Likewise,
<filename>prerm</filename> is invoked before removal of a package and
- <filename>postrm</filename> aftwards. An update of a package is
+ <filename>postrm</filename> afterwards. An update of a package is
equivalent to removal of the previous version and installation of the
new one. It is not possible to describe in detail all the possible
scenarios here, but we will discuss the most common two: an
@@ -908,7 +908,7 @@ Tag: admin::package-management, hardware::storage, hardware::storage:cd, interfa
program offers options that allow the system to respond
automatically according to the same logic:
<command>--force-confold</command> retains the old version of the
- file; <command>--force-confnew</command> wil use the new version of
+ file; <command>--force-confnew</command> will use the new version of
the file (these choices are respected, even if the file has not
been changed by the administrator, which only rarely has the
desired effect). Adding the <command>--force-confdef</command>
@@ -1635,7 +1635,7 @@ $ </computeroutput><userinput>ls -s phpmyadmin_2.0.5-2_all.deb</userinput>
<para>You will find that this process is extremely simple. You must
know, however, that the package generated does not have any information
on dependencies, since the dependencies in the two packaging formats
- don't have systematic correspondance. The administrator, thus, must
+ don't have systematic correspondence. The administrator, thus, must
manually ensure that the converted package will function correctly, and
this is why Debian packages thus generated should be avoided as much as
possible. Fortunately, Debian has the largest collection of software
--- a/en-US/06_apt.xml
+++ b/en-US/06_apt.xml
@@ -658,7 +658,7 @@ deb-src http://ftp.debian.org/debian stable main contrib non-free
<indexterm><primary><command>aptitude safe-upgrade</command></primary></indexterm>
<para>For more important upgrades, such as the change from one major
- Debian versionto the next, you need to use <command>aptitude
+ Debian version to the next, you need to use <command>aptitude
full-upgrade</command> (the option used to be named
<literal>dist-upgrade</literal>, for “distribution upgrade”).
With this instruction, <command>aptitude</command> will complete the
@@ -930,7 +930,7 @@ Pin-Priority: 500
role="distribution">Unstable</emphasis> without diverging too much
from the system's initial state.</para>
- <para>Even if you will occasionnaly encounter problems while mixing
+ <para>Even if you will occasionally encounter problems while mixing
packages from different distributions, <command>aptitude</command>
manages such coexistence very well and limits risks very effectively.
The best way to proceed is to list all distributions used in
@@ -1308,7 +1308,7 @@ i A apt-xapian-index Depends python-debian (>= 0.1.15)</computeroutput>
package that it did not recommend formerly, the package won't be
marked for installation. However, it will be listed on the upgrade
screen so that the administrator can still select it for
- installaion.</para>
+ installation.</para>
<para>Suggestions between packages are also taken into account, but
in a manner adapted to their specific status. For example, since
@@ -1370,7 +1370,7 @@ i A apt-xapian-index Depends python-debian (>= 0.1.15)</computeroutput>
<para>Beware, this logfile only contains a summary of operations
performed by <command>aptitude</command>. If other front-ends (or
- even <command>dpkg</command> itself) are occasionaly used, then
+ even <command>dpkg</command> itself) are occasionally used, then
<command>aptitude</command>'s log will only contain a partial
view of the operations, so you can't rely on it to build a
trustworthy history of the system.</para>
--- a/en-US/08_basic-configuration.xml
+++ b/en-US/08_basic-configuration.xml
@@ -84,7 +84,7 @@
<para>Historically, each locale has an associated “character
set” (group of known characters) and a preferred “encoding”
- (internal representationfor characters within the computer).</para>
+ (internal representation for characters within the computer).</para>
<para>The <emphasis>ISO-8859-1</emphasis> (or “Latin 1”)
encoding, for instance, was used preferentially in France. But for
@@ -769,7 +769,7 @@ adsl:2345:respawn:/usr/sbin/pppd call dsl-provider
<indexterm><primary>DNS</primary></indexterm>
<indexterm><primary>Domain Name Service</primary></indexterm>
- <para>DNS (Domain Name Service) is a distributed and hierarchal
+ <para>DNS (Domain Name Service) is a distributed and hierarchical
service mapping names to IP addresses, and vice-versa.
Specifically, it can turn a human-friendly name such as
<literal>www.eyrolles.com</literal> into the actual IP address,
@@ -1481,7 +1481,7 @@ nameserver 8.8.8.8
implementation of <filename>/dev/</filename> by a virtual
filesystem called <emphasis>devfs</emphasis>. In some cases, this
makes it easier to find files, since the naming convention uses a
- hierarchal structure: the first partition of the master hard drive
+ hierarchical structure: the first partition of the master hard drive
on the first IDE bus was then represented by the file,
<filename>/dev/ide/host0/bus0/target0/lun0/part1</filename>. Not
only were these naming conventions not very intuitive, but they
@@ -1639,7 +1639,7 @@ mirexpress:/dev/disk/by-id# </computeroutput>
boot=/dev/sda
# the partition that contains Debian
root=/dev/sda2
-# the item to be loaded by defaul
+# the item to be loaded by default
default=Linux
# the most recent kernel image
@@ -1927,7 +1927,7 @@ macosx=/dev/sda5
doesn't need access to hardware variables. However, since it only
exists in live memory, it is zeroed out every time the machine is
booted, contrary to the CMOS clock, which has a battery and
- therefores “survives” rebooting or halting of the machine. The
+ therefore “survives” rebooting or halting of the machine. The
system clock is, thus, set from the CMOS clock during boot, and the
CMOS clock is updated on shutdown (to take into account possible
changes or corrections if it has been improperly adjusted).</para>
--- a/en-US/09_unix-services.xml
+++ b/en-US/09_unix-services.xml
@@ -64,7 +64,7 @@
<para>In some configurations, the BIOS may be configured not to
execute the MBR, but to seek its equivalent on the network, making it
- posssible to build computers without a hard drive, or which are
+ possible to build computers without a hard drive, or which are
completely reinstalled on each boot. This option is not available on
all hardware and it generally requires an appropriate combination of
BIOS and network card.</para>
@@ -975,7 +975,7 @@
<title><emphasis>SECURITY</emphasis> <literal>setgid</literal> directory and <emphasis>sticky bit</emphasis></title>
<para>The <literal>setgid</literal> bit also applies to directories.
- Any newly-created item in such directories is automaticallly assigned
+ Any newly-created item in such directories is automatically assigned
the owner group of the parent directory, instead of inheriting the
creator's main group as usual. This setup avoids the user having to
change its main group (with the <command>newgrp</command> command)
@@ -1076,7 +1076,7 @@
represents a right to execute which applies only to directories (and
not to files lacking this right). Thus, <command>chmod -R a+X
<replaceable>directory</replaceable></command> will only add execute
- rights for all categoties of users (<literal>a</literal>) for all of
+ rights for all categories of users (<literal>a</literal>) for all of
the sub-directories and files for which at least one category of user
(even if their sole owner) already has execute rights.</para>
</sidebar>
@@ -2395,7 +2395,7 @@ exclude:
manner; on first boot (and, more generally, each time that a new
network card appears) it uses the name of the network interface and
its MAC address to create new rules that will reassign the same
- name on subsequents boots. These rules are stored in
+ name on subsequent boots. These rules are stored in
<filename>/etc/udev/rules.d/70-persistent-net.rules</filename>.</para>
<para>This mechanism has some side effects that you should know
--- a/en-US/10_network-infrastructure.xml
+++ b/en-US/10_network-infrastructure.xml
@@ -811,7 +811,7 @@ option /etc/ppp/pptpd-options
#
# Specifies the local and remote IP address ranges.
#
-# You can specify single IP addresses seperated by commas or you can
+# You can specify single IP addresses separated by commas or you can
# specify ranges, or both. For example:
#
# 192.168.0.234,192.168.0.245-249,192.168.0.254
@@ -1093,7 +1093,7 @@ iptables -t mangle -A PREROUTING -p tcp --dport ssh -j TOS --set-tos Minimize-De
<para>Dynamic routing allows routers to adjust, in real time, the
paths used for transmitting IP packets. Each protocol involves its
- own method of defining routes (shortest path, use routes advertized
+ own method of defining routes (shortest path, use routes advertised
by peers, and so on).</para>
<para>In the Linux kernel, a route links a network device to a set of
@@ -1379,7 +1379,7 @@ if_prefix=eth0
of version, have the same structure.</para>
<para>The Falcot administrators created a primary
- <literal>falcot.com</literal> zone to store informations related to
+ <literal>falcot.com</literal> zone to store information related to
this domain, and a <literal>168.192.in-addr.arpa</literal> zone for
reverse mapping of IP addresses in the local networks.</para>
@@ -1848,7 +1848,7 @@ Nmap done: 1 IP address (1 host up) scanned in 21.32 seconds
</mediaobject>
</figure>
- <para>In our example, the packets travelling over SSH are filtered
+ <para>In our example, the packets traveling over SSH are filtered
out (with the <literal>!tcp.port == 22</literal> filter). The packet
currently displayed was developed at the TCP and HTTP layers.</para>
--- a/en-US/11_network-services.xml
+++ b/en-US/11_network-services.xml
@@ -728,7 +728,7 @@ body_checks = regexp:/etc/postfix/body_checks
<para>The <emphasis>regular expression</emphasis> term (shortened
to <emphasis>regexp</emphasis> or <emphasis>regex</emphasis>)
- references a generic notation for expressing a descrition of the
+ references a generic notation for expressing a description of the
contents and/or structure of a string of characters. Certain
special characters allow defining alternatives (for instance,
<literal>foo|bar</literal> matches either “foo” or
@@ -1255,7 +1255,7 @@ relay_host = [mail.falcot.com]
on the domain name of the web server. The first method requires
allocating a different IP address (or port) for each site, whereas
the second one can work on a single IP address (and port), and the
- sites are differenciated by the hostname sent by the HTTP client
+ sites are differentiated by the hostname sent by the HTTP client
(which only works in version 1.1 of the HTTP protocol — fortunately
that version is old enough that all clients use it already).</para>
@@ -1265,7 +1265,7 @@ relay_host = [mail.falcot.com]
provided for name-based virtual hosting; the SNI extension
(<emphasis>Server Name Indication</emphasis>) that allows such a
combination is not handled by all browsers. When several HTTPS sites
- need to run on the same server, they will usually be differenciated
+ need to run on the same server, they will usually be differentiated
either by running on a different port or on a different IP address
(IPv6 can help there).</para>
@@ -1451,7 +1451,7 @@ DirectoryIndex index.php index.html index.htm
directive</primary></indexterm></para>
</listitem>
<listitem>
- <para><literal>MultiViews</literal> enables content negociation;
+ <para><literal>MultiViews</literal> enables content negotiation;
this can be used by the server to return a web page matching the
preferred language as configured in the browser.
<indexterm><primary><literal>MultiViews</literal>, Apache
@@ -1955,7 +1955,7 @@ options lockd nlm_udpport=2045 nlm_tcpport=2045
this can be disabled with the <literal>async</literal> option.
Asynchronous writes increase performance a bit, but they decrease
reliability since there's a data loss risk in case of the server
- crashing between the acknowledgement of the write and the actual
+ crashing between the acknowledgment of the write and the actual
write on disk. Since the default value changed recently (as compared
to the historical value of NFS), an explicit setting is
recommended.</para>
--- a/en-US/12_advanced-administration.xml
+++ b/en-US/12_advanced-administration.xml
@@ -47,7 +47,7 @@
with new block devices, which can be used to create filesystems or swap
space, without necessarily having them mapped to one physical disk.
RAID and LVM come from quite different backgrounds, but their
- functionality can overlap somewhat, which is why they are ofter
+ functionality can overlap somewhat, which is why they are often
mentioned together.</para>
<sidebar>
@@ -119,7 +119,7 @@
<section id="niveaux-de-raid">
<title>Different RAID Levels</title>
- <para>RAID has actually several levels, differenciated by their
+ <para>RAID has actually several levels, differentiated by their
layout and the amount of redundancy they provide. The more
redundant, the more failure-proof, since the system will be able to
keep working with more failed disks. The counterpart is that the
@@ -282,7 +282,7 @@
<varlistentry>
<term>RAID-1+0</term>
<listitem>
- <para>This isn't stricly speaking, a RAID level, but a
+ <para>This isn't strictly speaking, a RAID level, but a
stacking of two RAID groupings. Starting from 2×N disks, one
first sets them up by pairs into N RAID-1 volumes; these N
volumes are then aggregated into one, either by “linear
@@ -1211,7 +1211,7 @@ The filesystem on /dev/vg_critical/lv_files is now 1835008 blocks long.
<section id="raid-ou-lvm">
<title>RAID or LVM?</title>
- <para>RAID and LVM both bring undisputable advantages as soon as one
+ <para>RAID and LVM both bring indisputable advantages as soon as one
leaves the simple case of a desktop computer with a single hard disk
where the usage pattern doesn't change over time. However, RAID and
LVM go in two different directions, with diverging goals, and it is
@@ -1502,7 +1502,7 @@ Disk identifier: 0x00039a9f
role="pkg">linux-image-2.6-xen-686</emphasis> and <emphasis
role="pkg">linux-image-2.6-xen-amd64</emphasis> packages. This
distribution-specific patching means that the available featureset
- depends on the distibution; discrepancies in the versions of the
+ depends on the distribution; discrepancies in the versions of the
code, or even integration of code still under development into some
distributions also mean differences in the supported features. This
problem should be greatly reduced now that Xen has been officially
@@ -2388,7 +2388,7 @@ to the console to complete the installation process.
left empty in the case of the local host). In addition to that,
and in the QEMU/KVM case, each user can manage virtual machines
working with restricted permissions, and the URL path allows
- differenciating “system” machines
+ differentiating “system” machines
(<literal>/system</literal>) from others
(<literal>/session</literal>).</para>
</callout>
@@ -2566,7 +2566,7 @@ root@server's password: </computeroutput>
not update any software on their own, or install any other software.
Similarly, security updates must not be automated, because they have to
go through the centralized reference image maintained by SystemImager.
- This solution also requires the target machines to be homogenous,
+ This solution also requires the target machines to be homogeneous,
otherwise many different images would have to be kept and managed (an
i386 image won't fit on a powerpc machine, and so on).</para>
@@ -2886,7 +2886,7 @@ append preseed/file=/hd-media/preseed.cfg locale=en_US console-keymaps-at/keymap
<command>mkisofs</command> or <command>xorriso</command>. The
image directory is finalized after debian-cd's <command>make
image-trees</command> step. At that point, we insert the preseed
- file into the approriate directory (usually
+ file into the appropriate directory (usually
<filename>$TDIR/squeeze/CD1/</filename>, $TDIR being one of the
parameters defined by the <filename>CONF.sh</filename>
configuration file). The CD-ROM uses <command>isolinux</command>
@@ -3370,7 +3370,7 @@ load.info 5 minute load average
objects; in many cases, defining now hosts, services and contacts
is a simple matter of deriving from the provided generic objects.
The files in <filename>/etc/nagios3/conf.d/</filename> are a good
- source of informaton on how they work.</para>
+ source of information on how they work.</para>
<para>The Falcot Corp administrators use the following
configuration:</para>
--- a/en-US/13_workstation.xml
+++ b/en-US/13_workstation.xml
@@ -405,7 +405,7 @@
interfacing to GNOME.</para>
<para>It took quite some time for the GNOME project to build up this
- infrastructure, which can account for a seeminly less mature desktop
+ infrastructure, which can account for a seemingly less mature desktop
than KDE. The usability and accessibility efforts, in particular, are
recent, and the benefits have only started to show in the latest
versions of the environment.</para>
@@ -424,7 +424,7 @@
kind of registry that can be queried and edited with the
<command>gconftool-2</command> command-line tool. The administrator
can therefore change users' configuration with a simple script. The
- following webside lists all information of interest to an
+ following website lists all information of interest to an
administrator tasked to manage GNOME workstations: <ulink
type="block"
url="http://library.gnome.org/admin/system-admin-guide/stable/"/><ulink
@@ -507,7 +507,7 @@
project about the most popular packages. A script is run weekly
by <command>cron</command> which sends (by HTTP or email) an
anonymized list of the installed packages and the latest access
- date for the files they contain. This allows differenciating,
+ date for the files they contain. This allows differentiating,
among the installed packages, those that are actually
used.</para>
<indexterm><primary><emphasis role="pkg">popularity-contest</emphasis></primary></indexterm>
@@ -681,7 +681,7 @@
started reaching the masses, but it was progressively left behind
when Microsoft Internet Explorer came around. Faced with this
failure, Netscape (the company) decided to “free” its source
- code, by realeasing it under a free license, to give it a second
+ code, by releasing it under a free license, to give it a second
life. This was the beginning of the Mozilla project. After many
years of development, the results are more than satisfying: the
Mozilla project brought forth an HTML rendering engine (called
@@ -1085,7 +1085,7 @@
<para>Note that you should not rely on Wine (or similar solutions)
without actually testing the particular software: only a real-use test
will determine conclusively whether emulation is fully
- fuctional.</para>
+ functional.</para>
<sidebar role="fil">
<title><emphasis>ALTERNATIVE</emphasis> Virtual machines</title>
--- a/en-US/14_security.xml
+++ b/en-US/14_security.xml
@@ -68,7 +68,7 @@
<para>The term “risk” is customarily used to refer collectively to
these three factors: what to protect, what needs to be prevented from
- happening, and who will try to make it happen. Modelling the risk
+ happening, and who will try to make it happen. Modeling the risk
requires answers to these three questions. From this risk model, a
security policy can be constructed, and the policy can be implemented
with concrete actions.</para>
@@ -94,7 +94,7 @@
amount of inconvenience imposed on system users or performance
degradation.</para>
- <para>Once the risk has been modelled, one can start thinking about
+ <para>Once the risk has been modeled, one can start thinking about
designing an actual security policy.</para>
<sidebar>
@@ -465,11 +465,11 @@
to the <literal>-p</literal> option and it can be applied to all
other conditions too.</para>
- <para>The <literal>-s <replaceable>adress</replaceable></literal>
+ <para>The <literal>-s <replaceable>address</replaceable></literal>
or <literal>-s <replaceable>network/mask</replaceable></literal>
condition matches the source address of the packet.
Correspondingly, <literal>-d
- <replaceable>adress</replaceable></literal> or <literal>-d
+ <replaceable>address</replaceable></literal> or <literal>-d
<replaceable>network/mask</replaceable></literal> matches the
destination address.</para>
@@ -510,7 +510,7 @@
</listitem>
<listitem>
<para><literal>--log-prefix</literal> allows specifying a text
- prefix to differenciate between logged messages;</para>
+ prefix to differentiate between logged messages;</para>
</listitem>
<listitem>
<para><literal>--log-tcp-sequence</literal>,
@@ -689,7 +689,7 @@ iface eth0 inet static
directory);</para>
</listitem>
<listitem>
- <para>those cancelling such a qualification
+ <para>those canceling such a qualification
(<filename>/etc/logcheck/cracking.ignore.d/</filename>);</para>
</listitem>
<listitem>
@@ -697,7 +697,7 @@ iface eth0 inet static
(<filename>/etc/logcheck/violations.d/</filename>);</para>
</listitem>
<listitem>
- <para>those cancelling this classification
+ <para>those canceling this classification
(<filename>/etc/logcheck/violations.ignore.d/</filename>);</para>
</listitem>
<listitem>
@@ -904,7 +904,7 @@ iface eth0 inet static
<para>The first drawback can be avoided by asking
<command>debsums</command> to base its checks on a
<filename>.deb</filename> package instead of relying on the
- <filename>md5sums</filename> file. But that requires dowloading the
+ <filename>md5sums</filename> file. But that requires downloading the
matching <filename>.deb</filename> files first:</para>
<screen>
@@ -1017,7 +1017,7 @@ iface eth0 inet static
<para>The <emphasis role="pkg">chkrootkit</emphasis> and
<emphasis role="pkg">rkhunter</emphasis> packages allow looking
for <emphasis>rootkits</emphasis> potentially installed on the
- system. As a reminder, these are pieces of sofware designed to
+ system. As a reminder, these are pieces of software designed to
hide the compromise of a system while discreetly keeping control
of the machine. The tests are not 100% reliable, but they can
usually draw the administrator's attention to potential
@@ -1179,9 +1179,9 @@ iface eth0 inet static
<emphasis>objects</emphasis> (files, directories, sockets, devices,
etc.). They can vary from object to object. To achieve this, each
object is associated to a <emphasis>type</emphasis> (this is known as
- labelling). Domain's rights are thus expressed with sets of
+ labeling). Domain's rights are thus expressed with sets of
(dis)allowed operations on those types (and, indirectly, on all
- objects which are labelled with the given type).</para>
+ objects which are labeled with the given type).</para>
<sidebar>
<title><emphasis>EXTRA</emphasis> Domains and types are equivalent</title>
@@ -1194,8 +1194,8 @@ iface eth0 inet static
<para>By default, a program inherits its domain for the user who
started it but the standard SELinux policies expect many important
programs to run in dedicated domains. To achieve this, those
- executables are labelled with a dedicated type (for example
- <command>ssh</command> is labelled with
+ executables are labeled with a dedicated type (for example
+ <command>ssh</command> is labeled with
<literal>ssh_exec_t</literal>, and when the program starts, it
automatically switches in the <literal>ssh_t</literal> domain). This
automatic domain transition mechanism makes it possible to grant only
@@ -1294,9 +1294,9 @@ iface eth0 inet static
reboot.</para>
<para>It is worth noting that the <command>selinux-activate</command>
- script automates those operations and forces a labelling on next boot
+ script automates those operations and forces a labeling on next boot
(which avoids new non-labeled files created while SELinux was not yet
- active and while the labelling was going on).</para>
+ active and while the labeling was going on).</para>
</section>
<section id="section.selinux-gestion">
<title>Managing an SELinux System</title>
@@ -1516,7 +1516,7 @@ user_u user s0 s0 user_r
defines the rules. The <filename>.fc</filename> file defines the
“file contexts”, that is the types assigned to files related to
this module. The data within the <filename>.fc</filename> file are
- used during the file labelling step. Finally, the
+ used during the file labeling step. Finally, the
<filename>.if</filename> file defines the interface of the module:
it's a set of “public functions” that other modules can use to
properly interact with the module that you're creating.</para>
@@ -1708,7 +1708,7 @@ files_tmp_filetrans(myapp_t,myapp_tmp_t,file)
<callout arearefs="example.te.interface">
<para><literal>logging_log_file</literal> is an interface
provided by the reference policy. It indicates that files
- labelled with the given type are log files which ought to
+ labeled with the given type are log files which ought to
benefit from the associated rules (for example granting rights
to <command>logrotate</command> so that it can manipulate
them).</para>
@@ -1748,8 +1748,8 @@ files_tmp_filetrans(myapp_t,myapp_tmp_t,file)
application works and of what kind of data it manages and/or
generates.</para>
- <para>Howevever, an empirical approach is possible. Once the
- relevant objects are correctly labelled, you can use the
+ <para>However, an empirical approach is possible. Once the
+ relevant objects are correctly labeled, you can use the
application in permissive mode: the operations that would be
forbidden are logged but still succeed. By analysing the logs, you
can now identify the operations to allow. Here is an example of
@@ -1781,7 +1781,7 @@ files_tmp_filetrans(myapp_t,myapp_tmp_t,file)
<entry>
<computeroutput>{ read write }</computeroutput>
</entry>
- <entry>This operation required the <literal>read</literal> and <literal>write</literal> permisions.</entry>
+ <entry>This operation required the <literal>read</literal> and <literal>write</literal> permissions.</entry>
</row>
<row>
<entry>
@@ -1842,7 +1842,7 @@ files_tmp_filetrans(myapp_t,myapp_tmp_t,file)
<command>audit2allow</command> command (of the <emphasis
role="pkg">policycoreutils</emphasis> package) offers. This
approach is only useful if the various objects are already
- correctly labelled according to what must be confined. In any case,
+ correctly labeled according to what must be confined. In any case,
you will have to carefully review the generated rules and validate
them according to your knowledge of the application. Effectively,
this approach tends to grant more rights than are really required.
@@ -2076,7 +2076,7 @@ files_tmp_filetrans(myapp_t,myapp_tmp_t,file)
used to get administrator privileges on the whole machine.</para>
<para>By the same reasoning, firewalls will often be configured to
- only allow access to services that are meant to be publically
+ only allow access to services that are meant to be publicly
accessible.</para>
<para>Current computers are powerful enough to allow hosting several
--- a/en-US/15_debian-packaging.xml
+++ b/en-US/15_debian-packaging.xml
@@ -1014,7 +1014,7 @@ release_label = Internal Packages
thing for Debian. This usually implies that the candidate has
already been active within the community, and that their work has
been appreciated. If the candidate is shy and their work is not
- publically touted, they can try to convince a Debian developer to
+ publicly touted, they can try to convince a Debian developer to
advocate them by showing their work in a private way.</para>
<para>At the same time, the candidate must generate a
@@ -1050,7 +1050,7 @@ release_label = Internal Packages
<section>
<title>Accepting the Principles</title>
- <para>These adminitrative formalities are followed with
+ <para>These administrative formalities are followed with
philosophical considerations. The point is to make sure that the
candidate understands and accepts the social contract and the
principles behind Free Software. Joining Debian is only possible if
--- a/en-US/70_conclusion.xml
+++ b/en-US/70_conclusion.xml
@@ -75,7 +75,7 @@
new free software project is attracted.</para>
<para>Beyond the apparent satisfaction of most Debian users, a deep
- trend is becoming more and more undisputable: people are increasingly
+ trend is becoming more and more indisputable: people are increasingly
realising that collaborating, rather than doing business solo, leads to
better results for everyone. Such is the rationale used by
distributions merging into Debian by way of subprojects.</para>
--- a/en-US/92_short-remedial-course.xml
+++ b/en-US/92_short-remedial-course.xml
@@ -561,7 +561,7 @@ Bus 002 Device 004: ID 413c:8103 Dell Computer Corp. Wireless 350 Bluetooth
<indexterm><primary>system, filesystem</primary></indexterm>
<para>Filesystems are one of the most prominent aspects of the
- kernel. Unix systems merge all the file storages into a single
+ kernel. Unix systems merge all the file stores into a single
hierarchy, which allows users (and applications) to access data
simply by knowing its location within that hierarchy.</para>
@@ -928,7 +928,7 @@ Bus 002 Device 004: ID 413c:8103 Dell Computer Corp. Wireless 350 Bluetooth
family of operating systems is that each tool should only do one
thing, and do it well; applications can then reuse these tools to
build more advanced logic on top. This Way can be seen in many
- incarnations. Shell scripts may be the best example: they assemple
+ incarnations. Shell scripts may be the best example: they assemble
complex sequences of very simple tools (such as
<command>grep</command>, <command>wc</command>,
<command>sort</command>, <command>uniq</command> and so on).
