debian-reference: typos
Hi everyone,
I want notify few typos in debian-reference.
I hope it is the right way! I downloaded the source document from
git archive, and I generated a diff file of my local modifications.
You find it in attachment.
Cheers,
AndreA
diff --git a/en/appendix.en.xml b/en/appendix.en.xml
index d123858..eb7359f 100644
--- a/en/appendix.en.xml
+++ b/en/appendix.en.xml
@@ -17,7 +17,7 @@
<para/>
<section id="thedebianmaze">
<title>The Debian maze</title>
- <para>The Linux system is a very powerful computing platform for a networked computer. However, learning how to use all its capabilities is not easy. Setting up the LPR printer with non-PostScript printer was a good example of stumble pioints. (There are no issues anymore since newer installations use new CUPS system.) </para>
+ <para>The Linux system is a very powerful computing platform for a networked computer. However, learning how to use all its capabilities is not easy. Setting up the LPR printer with non-PostScript printer was a good example of stumble points. (There are no issues anymore since newer installations use new CUPS system.) </para>
<para>There is a complete, detailed map called the "SOURCE CODE". This is very accurate but very hard to understand. There are also references called HOWTO and mini-HOWTO. They are easier to understand but tend to give too much detail and lose the big picture. I sometimes have a problem finding the right section in a long HOWTO when I need a few commands to invoke. </para>
<para>I hope this "Debian Reference (version 2)" will provide good starting direction for people in the Debian maze. </para>
<para/>
diff --git a/en/dataconversion.en.xml b/en/dataconversion.en.xml
index c988b5b..2860322 100644
--- a/en/dataconversion.en.xml
+++ b/en/dataconversion.en.xml
@@ -348,7 +348,7 @@
</listitem>
</itemizedlist>
<para>For these, there are clear differentiation between the character set and the character encoding. </para>
- <para>The <ulink url="&codepage;">code page</ulink> is used as the synonym to the character encoding tables for some vender specific ones. </para>
+ <para>The <ulink url="&codepage;">code page</ulink> is used as the synonym to the character encoding tables for some vendor specific ones.</para>
<note><para> Please note most encoding systems share the same code with ASCII for the 7 bit characters. But there are some exceptions. If you are converting old Japanese C programs and URLs data from the casually-called shift-JIS encoding format to UTF-8 format, use "<code>CP932</code>" as the encoding name instead of "<code>shift-JIS</code>" to get the expected results: 0x5C -> "<code>\</code>" and 0x7E -> "<code>~</code>" . Otherwise, these are converted to wrong characters. </para></note>
<tip><para> The <code>recode</code> command may be used too and offers more than the combined functionality of the <code>iconv</code>, <code>fromdos</code>, <code>todos</code>, <code>frommac</code>, and <code>tomac</code> commands. For more, see pertinent description in the "<code>info recode</code>". </para></tip>
<para/>
@@ -1626,7 +1626,7 @@ done
<para/>
<section id="theghostscript">
<title>The Ghostscript</title>
- <para>The core of printable data manipulation is the the Ghostscript PostScript interpreter. CUPS uses the Ghostscript as its backend. </para>
+ <para>The core of printable data manipulation is the Ghostscript PostScript interpreter. CUPS uses the Ghostscript as its backend. </para>
<para>The latest upstream Ghostscript from Artifex was re-licensed from AFPL to GPL and merged all the latest ESP version changes such as CUPS related ones at 8.60 release as unified release. </para>
<table id="listofghostscripriptinterpreters">
@@ -2920,7 +2920,7 @@ $ man -Tps some_manpage | mpage -2 | lpr
<para> image(Exif)->html </para>
</entry>
<entry>
- <para> Generates browsable HTML photo albums with thumnails </para>
+ <para> Generates browsable HTML photo albums with thumbnails </para>
</entry>
</row><row>
<entry>
diff --git a/en/datamanagement.en.xml b/en/datamanagement.en.xml
index 9d28afa..c1978b9 100644
--- a/en/datamanagement.en.xml
+++ b/en/datamanagement.en.xml
@@ -400,7 +400,7 @@ $ afio -ivZ archive.afio
<para>We all know that computers fail sometime or human errors cause system and data damages. Backup and recovery operations are the essential part of successful system administration. All possible failure modes will hit you some day. </para>
<para>There are 3 key factors which determine actual backup and recovery policy: </para>
<orderedlist numeration="arabic">
- <listitem>Knowing what to buckup and recover. <itemizedlist><listitem><para>Data files directly created by you: data in <code>/$HOME/</code> </para></listitem><listitem><para>Data files created by applications used by you: data in <code>/var/</code> (except <code>/var/cache/</code>, <code>/var/run/</code>, and <code>/var/tmp/</code>). </para></listitem><listitem><para>System configuration files: data in <code>/etc/</code> </para></listitem><listitem><para>Local softwares: data in <code>/usr/local/</code> or <code>/opt/</code> </para></listitem><listitem><para>System installation information: a memo in plain text on key steps (partition, ...). </para></listitem><listitem><para>Proven set of data: experimenting with recovery operations in advance. </para></listitem></itemizedlist></listitem>
+ <listitem>Knowing what to backup and recover. <itemizedlist><listitem><para>Data files directly created by you: data in <code>/$HOME/</code> </para></listitem><listitem><para>Data files created by applications used by you: data in <code>/var/</code> (except <code>/var/cache/</code>, <code>/var/run/</code>, and <code>/var/tmp/</code>). </para></listitem><listitem><para>System configuration files: data in <code>/etc/</code> </para></listitem><listitem><para>Local softwares: data in <code>/usr/local/</code> or <code>/opt/</code> </para></listitem><listitem><para>System installation information: a memo in plain text on key steps (partition, ...). </para></listitem><listitem><para>Proven set of data: experimenting with recovery operations in advance. </para></listitem></itemizedlist></listitem>
<listitem>Knowing how to backup and recover. <itemizedlist><listitem><para>Secure storage of data: protection from overwrite and system failure. </para></listitem><listitem><para>Frequent backup: scheduled backup. </para></listitem><listitem><para>Redundant backup: data mirroring. </para></listitem><listitem><para>Fool proof process: easy single command backup. </para></listitem></itemizedlist></listitem>
<listitem>Assessing risks and costs involved. <itemizedlist><listitem><para>Failure mode and their possibility. </para></listitem><listitem><para>Value of data when lost. </para></listitem><listitem><para>Required resources for backup: human, hardware, software, ... </para></listitem></itemizedlist></listitem>
</orderedlist>
@@ -441,7 +441,7 @@ touch /last-backup.stamp
<listitem><para>Edit this script to your needs before you execute this. </para></listitem>
<listitem><para>This is meant to be executed from root. </para></listitem>
<listitem>
- <para>Add directories to back up to "<code>find ...</code>" if you have important data elesewhere. (www, mail, subversion, ...) </para>
+ <para>Add directories to back up to "<code>find ...</code>" if you have important data elsewhere. (www, mail, subversion, ...) </para>
</listitem>
<listitem>
<para>Instead of "<code>find ...</code>", use "<code>find -cnewer /last-backup.stamp ...</code>" to narrow down the scope of backup to differential backup. </para>
@@ -759,7 +759,7 @@ fi
<para><code>part.img</code> : the partition table of the MBR only.. </para>
</listitem>
</itemizedlist>
- <para>If you have a SCSI device (including the new serial ATA drive) as the the boot disk, substitute "<code>/dev/hda</code>" with "<code>/dev/sda</code>". </para>
+ <para>If you have a SCSI device (including the new serial ATA drive) as the boot disk, substitute "<code>/dev/hda</code>" with "<code>/dev/sda</code>". </para>
<para>If you are making an image of a disk partition of the original disk, substitute "<code>/dev/hda</code>" with "<code>/dev/hda1</code>" etc. </para>
<note><para> The boot record structure of the different architecture computer such as Sun workstation are different. New Intel-based Macs use new EFI partition scheme and are different too. </para></note>
<para/>
@@ -769,7 +769,7 @@ fi
<para>The disk image file, <code>disk.img</code> can be written to an unmounted device, e.g., the second SCSI drive <code>/dev/sdb</code> with matching size, by <code>dd</code>(1): </para>
<screen># dd if=disk.img of=/dev/sda
</screen>
- <para>Similry, the disk partition image file, <code>disk.img</code> can be written to an unmounted partition, e.g., the first partition of the second SCSI drive <code>/dev/sdb1</code> with matching size, by <code>dd</code>(1): </para>
+ <para>Similarly, the disk partition image file, <code>disk.img</code> can be written to an unmounted partition, e.g., the first partition of the second SCSI drive <code>/dev/sdb1</code> with matching size, by <code>dd</code>(1): </para>
<screen># dd if=disk.img of=/dev/sda1
</screen>
<para/>
@@ -1365,7 +1365,7 @@ $ md5sum -c baz.md5
foo: OK
bar: OK
</screen>
- <note><para> The computation for the MD5 sum is less CPU intensive than the one for the cryptographic signiture by the Gnupg. Usually, only the top level digest file is cryptographically signed to ensure data integrity. </para></note>
+ <note><para> The computation for the MD5 sum is less CPU intensive than the one for the cryptographic signature by the Gnupg. Usually, only the top level digest file is cryptographically signed to ensure data integrity. </para></note>
<para/>
</section>
</section>
@@ -2333,13 +2333,13 @@ $ patch -p1 file < file.patch1
<para>Check </para>
<itemizedlist>
<listitem>
- <para>"<code>snsible-browser file:///usr/share/doc/cvs/html-cvsclient</code>", </para>
+ <para>"<code>sensible-browser file:///usr/share/doc/cvs/html-cvsclient</code>", </para>
</listitem>
<listitem>
- <para>"<code>snsible-browser file:///usr/share/doc/cvs/html-info</code>", </para>
+ <para>"<code>sensible-browser file:///usr/share/doc/cvs/html-info</code>", </para>
</listitem>
<listitem>
- <para>"<code>snsible-browser file:///usr/share/doc/cvsbook</code>", </para>
+ <para>"<code>sensible-browser file:///usr/share/doc/cvsbook</code>", </para>
</listitem>
<listitem>
<para>"<code>info cvs</code>", and </para>
diff --git a/en/i18nl10n.en.xml b/en/i18nl10n.en.xml
index 593b928..4fd5920 100644
--- a/en/i18nl10n.en.xml
+++ b/en/i18nl10n.en.xml
@@ -277,14 +277,14 @@
<para>The traditional encoding system in Unix is used for "<code>LANG=xx_YY</code>" (see: <xref linkend="thedpartsoflocalevalue"/>). </para>
</listitem>
</itemizedlist>
- <para>Actual traditional encoding system used for "<code>LANG=xx_YY</code>" can be identified by checking "<code>/usr/share/i18n/SUPOORTED</code>". For example, "<code>en_US</code>" uses "<code>ISO-8859-1</code>" encoding and "<code>fr_FR@euro</code>" uses "<code>ISO-8859-15</code>" encoding. </para>
+ <para>Actual traditional encoding system used for "<code>LANG=xx_YY</code>" can be identified by checking "<code>/usr/share/i18n/SUPPORTED</code>". For example, "<code>en_US</code>" uses "<code>ISO-8859-1</code>" encoding and "<code>fr_FR@euro</code>" uses "<code>ISO-8859-15</code>" encoding. </para>
<tip><para> For meaning of encoding values, see: <xref linkend="listofencodingvauesandtheirusage"/> . </para></tip>
<para/>
</section>
<section id="rationaleforutfilocale">
<title>Rationale for UTF-8 locale</title>
<para>The <ulink url="&utfi;">UTF-8</ulink> encoding is the modern and sensible text encoding system for I18N and enables to represent <ulink url="&unicode;">Unicode</ulink> characters, i.e., practically all characters known to human. <emphasis role="strong">UTF</emphasis> stands for Unicode Transformation Format (UTF) schemes. </para>
- <para>I recommend to use <ulink url="&utfi;">UTF-8</ulink> locale for your desktop, e.g., "<code>LANG=en_US.UTF-8</code>". The first part of the locale detrmines messages presented by applications. For example, <code>gedit</code>(1) (text editor for the GNOME Desktop) under "<code>LANG=fr_FR.UTF-8</code>" locale can display and edit Chinese character text data while presenting menus in French, as long as required fonts and input methods are installed. </para>
+ <para>I recommend to use <ulink url="&utfi;">UTF-8</ulink> locale for your desktop, e.g., "<code>LANG=en_US.UTF-8</code>". The first part of the locale determines messages presented by applications. For example, <code>gedit</code>(1) (text editor for the GNOME Desktop) under "<code>LANG=fr_FR.UTF-8</code>" locale can display and edit Chinese character text data while presenting menus in French, as long as required fonts and input methods are installed. </para>
<para>I also recommend to set the locale only using <code>LANG</code> environment variable. I do not see much benefit of setting a complicated combination of <code>LC_*</code> variables (see <code>locale</code>(1) manpage) under UTF-8 locale. </para>
<para>Even plain English text may contain non-ASCII characters, e.g. left and right quotation marks are not available in ASCII: </para>
<screen>“double quoted text”
@@ -292,7 +292,7 @@
</screen>
<para>When <ulink url="&ascii;">ASCII</ulink> plain text data is converted to <ulink url="&utfi;">UTF-8</ulink> one, it has exactly the same content and size as the original ASCII one. So you loose nothing by deploying UTF-8 locale. </para>
<para>Some programs consume more memory after supporting I18N. This is because they are coded to use <ulink url="&utfdcucse;">UTF-32(UCS4)</ulink> internally to support Unicode for speed optimization and consume 4 bytes per each ASCII character data independent of locale selected. Again, you loose nothing by deploying UTF-8 locale. </para>
- <para>The vender specific old non-UTF-8 encoding systems tend to have minor but annoying diferences on some charactrs such as graphic ones for many countries. The deplyment of the UTF-8 system by the modern OSs practically solved these conflicting encoding issues. </para>
+ <para>The vendor specific old non-UTF-8 encoding systems tend to have minor but annoying differences on some characters such as graphic ones for many countries. The deployment of the UTF-8 system by the modern OSs practically solved these conflicting encoding issues. </para>
<para/>
</section>
<section id="thereconfigurationofthelocale">
@@ -360,7 +360,7 @@
<screen>LANG="en_US.UTF-8"
</screen>
<para>This is the most generic technique to customize locale. </para>
- <para>Alernatively for this case, you may simply change locale using the <code>$HOME/.xsessionrc</code> file. </para>
+ <para>Alternatively for this case, you may simply change locale using the <code>$HOME/.xsessionrc</code> file. </para>
<para/>
</section>
<section id="filenameencoding">
diff --git a/en/internetapp.en.xml b/en/internetapp.en.xml
index 9019608..8b1de99 100644
--- a/en/internetapp.en.xml
+++ b/en/internetapp.en.xml
@@ -149,7 +149,7 @@
<entry><para>&pop-saslcbin;</para></entry>
<entry><para>&size-saslcbin;</para></entry>
<entry>
- <para> Cyrus SASL API implementation (suppliment postfix for SMTP-AUTH) </para>
+ <para> Cyrus SASL API implementation (supplement postfix for SMTP-AUTH) </para>
</entry>
</row><row>
<entry>
diff --git a/en/network.en.xml b/en/network.en.xml
index 48f6caa..0003cfb 100644
--- a/en/network.en.xml
+++ b/en/network.en.xml
@@ -1106,7 +1106,7 @@ $ sudo /sbin/ifconfig eth0 down
<para/>
<section id="thecommandsyntaxsimplified">
<title>The command syntax simplified</title>
- <para>The <code>ifupdown</code> package conatins 2 commands: <code>ifup</code>(8) and <code>ifdown</code>(8). They offer basic network configuration. </para>
+ <para>The <code>ifupdown</code> package contains 2 commands: <code>ifup</code>(8) and <code>ifdown</code>(8). They offer basic network configuration. </para>
<table id="listofbasicnetwoandswithifupdown">
<title> List of basic network configuration commands with ifupdown. </title><tgroup x-pkgname=" " x-popcon="" x-pkgsize="" cols="2">
@@ -1398,7 +1398,7 @@ iface eth0 inet dhcp
<section id="thewirelesslanincewiththewapwapc">
<title>The wireless LAN interface with the WAP/WAP2</title>
<para>You need to install the <code>wpasupplicant</code> package to support the WLAN with the new WAP/WAP2. </para>
- <para>In case of the DHCP served IP on WLAN connection provided by the the <emphasis role="strong">madwifi</emphasis> driver backend, the <emphasis role="strong"><code>/e/n/i</code></emphasis> file entry should be: </para>
+ <para>In case of the DHCP served IP on WLAN connection provided by the <emphasis role="strong">madwifi</emphasis> driver backend, the <emphasis role="strong"><code>/e/n/i</code></emphasis> file entry should be: </para>
<screen>allow-hotplug ath0
iface ath0 inet dhcp
wpa-driver madwifi
@@ -1570,7 +1570,7 @@ iface eth0:0 inet static
broadcast 192.168.0.255
metric 1
</screen>
- <caution><para> Althugh this onfiguration example with <ulink url="&networkaddresstranslation;">network address translation</ulink> using <ulink url="&netfilteriptables;">netfilter/iptables</ulink> (see <xref linkend="netfilter"/>) can provide cheap router for the LAN, there is no real firewall capability with such set up. You should use 2 physical interfaces to secure the real network separation. </para></caution>
+ <caution><para>Although this configuration example with <ulink url="&networkaddresstranslation;">network address translation</ulink> using <ulink url="&netfilteriptables;">netfilter/iptables</ulink> (see <xref linkend="netfilter"/>) can provide cheap router for the LAN, there is no real firewall capability with such set up. You should use 2 physical interfaces to secure the real network separation. </para></caution>
<para/>
</section>
<section id="theadvancedcommandsyntax">
@@ -1761,7 +1761,7 @@ Password:
<screen>$ sudo ifup eth0=config2
...
</screen>
- <para>The interface <code>eth0</code> is up, configured with static IP and connected to LAN. The additional parameters given as <code>dns-*</code> configures <code>/etc/resolv.conf</code> contents. This <code>/etc/resolv.conf</code> is better maneged if the <code>resolvconf</code> package is installed. </para>
+ <para>The interface <code>eth0</code> is up, configured with static IP and connected to LAN. The additional parameters given as <code>dns-*</code> configures <code>/etc/resolv.conf</code> contents. This <code>/etc/resolv.conf</code> is better managed if the <code>resolvconf</code> package is installed. </para>
<screen>$ sudo ifdown eth0=config2
...
</screen>
@@ -1892,7 +1892,7 @@ Password:
</table>
<para>Here, each environment variable name, <code>IF_<OPTION></code>, is created from the name for the corresponding option by prepending "<code>IF_</code>", converting the case to the upper case, replacing hyphens to underscores, and discarding non-alphanumeric characters. </para>
<para>The <code>ifupdown-extra</code> package (see <xref linkend="theifupdownextrapackage"/>) uses these environment variables to extend the functionality of the <code>ifupdown</code> package. The <code>ifmetric</code> package (see <xref linkend="theifmetric"/>) installs the <code>/etc/network/if-up.d/ifmetric</code> script which sets the metric via the <code>IF_METRIC</code> variable. The <code>guessnet</code> package (see <xref linkend="mappingwithguessnet"/>), which provides simple and powerful framework for the auto-selection of the network configuration via the mapping mechanism, also uses these. </para>
- <note><para> For more specific examples of custom network configuration scripts using these environment variables, you should check example scripts in <code>/usr/share/doc/ifupdown/examples/*</code> and scripts used in the <code>ifscheme</code> and <code>ifupdown-scripts-zg2</code> packages. These addyional scripts have some overlaps of functinalities with the basic <code>ifupdown-extra</code> and <code>guessnet</code> packages. If you install these additional scripts, you should customize these scripts to avoid interferences. </para></note>
+ <note><para> For more specific examples of custom network configuration scripts using these environment variables, you should check example scripts in <code>/usr/share/doc/ifupdown/examples/*</code> and scripts used in the <code>ifscheme</code> and <code>ifupdown-scripts-zg2</code> packages. These additional scripts have some overlaps of functionalities with the basic <code>ifupdown-extra</code> and <code>guessnet</code> packages. If you install these additional scripts, you should customize these scripts to avoid interferences. </para></note>
<para/>
</section>
<section id="mappingwithguessnet">
diff --git a/en/package.en.xml b/en/package.en.xml
index 2340be8..185c70d 100644
--- a/en/package.en.xml
+++ b/en/package.en.xml
@@ -472,7 +472,7 @@ deb-src http://security.debian.org/ &codename-stable;/updates main contrib
</table>
<tip><para> For the Debian system with the "<code>stable</code>" and "<code>testing</code>" suites, it is a good idea to include lines with <ulink url="&httpsecuritydebianorg;">http://security.debian.org/</ulink> in the <code>/etc/apt/sources.list</code> to enable access to the archive for security updates as in the example above. </para></tip>
<caution><para> Only pure <emphasis role="strong"><code>stable</code></emphasis> release with security updates provides the best stability. Running mostly <emphasis role="strong"><code>stable</code></emphasis> release mixed with some packages from <emphasis role="strong"><code>testing</code></emphasis> or <emphasis role="strong"><code>unstable</code></emphasis> release is riskier than running pure <emphasis role="strong"><code>unstable</code></emphasis> release. If you really need the latest version of some programs under <emphasis role="strong"><code>stable</code></emphasis> release, please use packages from <ulink url="&thedebianvolatileproject;">the debian-volatile project</ulink> and <ulink url="&httpbackportsorg;">http://backports.org/</ulink> (see: <xref linkend="volatileandbackportsorg"/>) services. These services must be used with extra care. </para></caution>
- <caution><para> You should basically list only one of "<code>stable</code>", "<code>testing</code>", or "<code>stable</code>" suites in the "<code>deb</code>" line. If you list any combination of "<code>stable</code>", "<code>testing</code>", and "<code>stable</code>" suites in the "<code>deb</code>" line, APT programs slow down while only the the latest archive is effective. Multiple listing makes sense for these when the <code>/etc/apt/preferences</code> file is used with clear objectives (see: <xref linkend="tweakingcandidateversion"/>). </para></caution>
+ <caution><para> You should basically list only one of "<code>stable</code>", "<code>testing</code>", or "<code>stable</code>" suites in the "<code>deb</code>" line. If you list any combination of "<code>stable</code>", "<code>testing</code>", and "<code>stable</code>" suites in the "<code>deb</code>" line, APT programs slow down while only the latest archive is effective. Multiple listing makes sense for these when the <code>/etc/apt/preferences</code> file is used with clear objectives (see: <xref linkend="tweakingcandidateversion"/>). </para></caution>
<para/>
<para>Each Debian archive consists of 3 components. Components are alternatively called <ulink url="&categoriesindebianpolicy;">categories in "Debian Policy"</ulink> or areas in <ulink url="&debiansocialcontract;">"Debian Social Contract"</ulink>. The component is grouped by the compliance to <ulink url="&thedebianfreesofreguidelinesdfsg;">"The Debian Free Software Guidelines " (DFSG)</ulink>: </para>
<table id="thelistsofdebianrchivecomponents">
@@ -2354,7 +2354,7 @@ MD5Sum:
</listitem>
</itemizedlist>
<para>The integrity of all the <code>Packages</code> and <code>Sources</code> files are verified by using MD5sum values in its top level <code>Release</code> file. The integrity of all package files are verified by using MD5sum values in the <code>Packages</code> and <code>Sources</code> files. See <code>debsums</code>(1) and <xref linkend="verifyinstalledpackagefiles"/>. </para>
- <para>Since the cryptographic signature verification is very CPU intensive process than the MD5sum value calculation, use of MD5sum value for each package while using cryptographic signature for the the top level <code>Release</code> file provides <ulink url="&thegoodsecuritywththeperformance;">the good security with the performance</ulink> (see: <xref linkend="datasecurityinfrastructure"/>). </para>
+ <para>Since the cryptographic signature verification is very CPU intensive process than the MD5sum value calculation, use of MD5sum value for each package while using cryptographic signature for the top level <code>Release</code> file provides <ulink url="&thegoodsecuritywththeperformance;">the good security with the performance</ulink> (see: <xref linkend="datasecurityinfrastructure"/>). </para>
<para/>
</section>
<section id="archivelevelreleasefiles">
@@ -2946,7 +2946,7 @@ Enter to keep the default[*], or type selection number: 1
<tip><para> The version string comparison rule can be verified with, e.g., "<code>dpkg --compare-versions ver1.1 gt ver1.1~1; echo $?</code>" (see <code>dpkg</code>(1)). </para></tip>
<para>When you install packages from mixed source of archives (see <xref linkend="packagesfrommixesourceofarchives"/>) regularly, you can automate these complicated operations by creating the <code>/etc/apt/preferences</code> file with proper entries and tweaking the package selection rule for <emphasis role="strong">candidate version</emphasis> as described in <code>apt_preferences</code>(5). This is called <emphasis role="strong">apt-pinning</emphasis>. </para>
<warning><para> Use of apt-pinning by a novice user is sure call for major troubles. You must avoid using apt-pinning except when you absolutely need it. </para></warning>
- <caution><para> When using apt-pinning, you must ensure compatibility of packages by yourself since the Debian does not gurantee it. The apt-pinning is completely optional operation and its use is not something I encourage you to use. </para></caution>
+ <caution><para> When using apt-pinning, you must ensure compatibility of packages by yourself since the Debian does not guarantee it. The apt-pinning is completely optional operation and its use is not something I encourage you to use. </para></caution>
<caution><para> Archive level Release files (see <xref linkend="archivelevelreleasefiles"/>) are used for the rule of <code>apt_preferences</code>(5). Thus apt-pinning works only with "suite" name for <ulink url="&normaldebianarchives;">normal Debian archives</ulink> and <ulink url="&securitydebianarchives;">security Debian archives</ulink>. (This is different from <ulink url="&ubuntu;">Ubuntu</ulink> archives). For example, you can do "<code>Pin: release a=unstable</code>" but can not do "<code>Pin: release a=sid</code>" in the <code>/etc/apt/preferences</code> file. </para></caution>
<note><para> Even if you do not create the <code>/etc/apt/preferences</code> file, you can do fairly complex system operations (see <xref linkend="rescueusingthedpkgcommand"/> and <xref linkend="packagesfrommixesourceofarchives"/>) without apt-pinning. </para></note>
<para>Here is a simplified explanation of <emphasis role="strong">apt-pinning</emphasis> technique. Each package has its Pin-Priority value based on the entries in the <code>/etc/apt/preferences</code> file or the default values. </para>
diff --git a/en/preface.en.xml b/en/preface.en.xml
index 2edda10..3e0fe9b 100644
--- a/en/preface.en.xml
+++ b/en/preface.en.xml
@@ -140,7 +140,7 @@ $ <command in user account>
<para/>
<para>The popcon number preceded with "V:" for "votes" is calculated by 100 * (the popcon submissions for the package executed recently on the PC)/(the total popcon submissions). </para>
<para>The popcon number preceded with "I:" for "installs" is calculated by 100 * (the popcon submissions for the package installed on the PC)/(the total popcon submissions). </para>
- <note><para> The popcon figures should not be considered as absolute measures of the importance of packages. There are many factors which can skew statistics. For example, some system participating popcon may have mounted directories such as <code>/bin</code> with "noatime" option for system performance improvement and effectivily disabled "vote" from such system. </para></note>
+ <note><para> The popcon figures should not be considered as absolute measures of the importance of packages. There are many factors which can skew statistics. For example, some system participating popcon may have mounted directories such as <code>/bin</code> with "noatime" option for system performance improvement and effectively disabled "vote" from such system. </para></note>
<para/>
</section>
<section id="thepackagesize">
diff --git a/en/program.en.xml b/en/program.en.xml
index b51c3c3..8574820 100644
--- a/en/program.en.xml
+++ b/en/program.en.xml
@@ -1611,7 +1611,7 @@ $ sudo debi package_name*.changes
</section>
<section id="disassemblebinary">
<title>Disassemble binary</title>
- <para>You can dissassemble binary code with <code>objdump</code>(1). For example: </para>
+ <para>You can disassemble binary code with <code>objdump</code>(1). For example: </para>
<screen>$ objdump -m i386 -b binary -D /usr/lib/grub/x86_64-pc/stage1
</screen>
<note><para><code>gdb</code>(1) may be used to disassemble code interactively. </para></note>
diff --git a/en/systeminit.en.xml b/en/systeminit.en.xml
index 663cc28..36e9f7e 100644
--- a/en/systeminit.en.xml
+++ b/en/systeminit.en.xml
@@ -51,7 +51,7 @@
<section id="stagecthebootloader">
<title>Stage 2: the boot loader</title>
<para>The <ulink url="&bootloader;">boot loader</ulink> is the 2nd stage of the boot process which is started by the BIOS. It loads the system kernel image and the <ulink url="&initrd;">initrd</ulink> image to the memory and hands control over to them. This initrd image is the root filesystem image and its support depends on the bootloader used. </para>
- <para>The Debian system normally uses the Linux kernel as the default system kernel. The initrd image for the current 2.6 Linux kernel is technically the initramfs (initial RAM filesystem) image. The initramfs image is a gzipped cpio archive of files in the the root filesystem. </para>
+ <para>The Debian system normally uses the Linux kernel as the default system kernel. The initrd image for the current 2.6 Linux kernel is technically the initramfs (initial RAM filesystem) image. The initramfs image is a gzipped cpio archive of files in the root filesystem. </para>
<para/>
<para/>
<para>The default install of the Debian system places first-stage GRUB boot loader code into the <ulink url="&mbr;">MBR</ulink> for the PC platform. There are many boot loaders and configuration options available. </para>
@@ -542,7 +542,7 @@ initrd /boot/initrd.img-2.6.18-3-686
</section>
<section id="networkinterfaceinitialization">
<title>Network interface initialization</title>
- <para>Network interfces are initialized under single-user mode on boot by the initscript <code>/etc/init.d/ifupdown-clean</code> and <code>/etc/init.d/ifupdown</code>. See <xref linkend="thenetwork"/> for how to configure them. </para>
+ <para>Network interfaces are initialized under single-user mode on boot by the initscript <code>/etc/init.d/ifupdown-clean</code> and <code>/etc/init.d/ifupdown</code>. See <xref linkend="thenetwork"/> for how to configure them. </para>
<para/>
</section>
<section id="networkserviceinitialization">
diff --git a/en/systemtips.en.xml b/en/systemtips.en.xml
index a4624a3..eaaf1f2 100644
--- a/en/systemtips.en.xml
+++ b/en/systemtips.en.xml
@@ -19,7 +19,7 @@
<section id="thescreenprogram">
<title>The screen program</title>
<para>The <code>screen</code> program (popcon: &pop-screen;) enables to have multiple terminals on a single physical terminal. </para>
- <para>It also accomodates <emphasis role="strong">remote shell process to survive the interrupted connection</emphasis>. This is the essential tool for people to access remote sites via the unreliable connection. </para>
+ <para>It also accommodates <emphasis role="strong">remote shell process to survive the interrupted connection</emphasis>. This is the essential tool for people to access remote sites via the unreliable connection. </para>
<para/>
<section id="theusescenariofothescreencommand">
<title>The use scenario for the screen command</title>
@@ -411,7 +411,7 @@
</row></tbody>
</tgroup>
</table>
- <note><para><ulink url="&crmbbe;">CRM114</ulink> provides language infrastructure to write <emphasis role="strong">fuzzy</emphasis> filters with the <ulink url="&treregexlibrary;">TRE regex library</ulink>. Its popular use is spam mail filter but it can be used as log analizer. </para></note>
+ <note><para><ulink url="&crmbbe;">CRM114</ulink> provides language infrastructure to write <emphasis role="strong">fuzzy</emphasis> filters with the <ulink url="&treregexlibrary;">TRE regex library</ulink>. Its popular use is spam mail filter but it can be used as log analyzer. </para></note>
<para/>
<para/>
<para/>
@@ -489,7 +489,7 @@ else
alias la='ls -A'
fi
</screen>
- <para>The use of alias limits color effects to the interactive command usage. It has advanatge over exporting environment variable "<code>export GREP_OPTIONS='--color=auto'</code>" since color can be seen under pager programs such as "<code>less</code>". </para>
+ <para>The use of alias limits color effects to the interactive command usage. It has advantage over exporting environment variable "<code>export GREP_OPTIONS='--color=auto'</code>" since color can be seen under pager programs such as "<code>less</code>". </para>
<tip><para> You can turn off these colorizing aliases in the interactive environment by invoking shell with "<code>TERM=dumb bash</code>". </para></tip>
<para/>
</section>
@@ -510,7 +510,7 @@ fi
<para>the "<code>$HOME/.mailcap</code>" and "<code>/etc/mailcap</code>" file contents which associate <ulink url="&mime;">MIME</ulink> type with program (see <code>mailcap</code>(5)). </para>
</listitem>
<listitem>
- <para>the the "<code>$HOME/.mime.types</code>" and "<code>/etc/mime.types</code>" file contents which associate file name extention with <ulink url="&mime;">MIME</ulink> type (see <code>run-mailcap</code>(1)). </para>
+ <para>the "<code>$HOME/.mime.types</code>" and "<code>/etc/mime.types</code>" file contents which associate file name extention with <ulink url="&mime;">MIME</ulink> type (see <code>run-mailcap</code>(1)). </para>
</listitem>
</itemizedlist>
<tip><para> The <code>update-mime</code>(8) command updates the "<code>/etc/mailcap</code>" file using "<code>/etc/mailcap.order</code>" file (see <code>mailcap.order</code>(5)). </para></tip>
diff --git a/en/tutorial.en.xml b/en/tutorial.en.xml
index 3bec23b..50bc198 100644
--- a/en/tutorial.en.xml
+++ b/en/tutorial.en.xml
@@ -2614,7 +2614,7 @@ $ man builtins
$ man grep
$ man ls
</screen>
- <para>The style of man pages may be a little hard to get used to, because they are rather terse, particularly the older, very traditional ones. But once you get used to it, you come to appreciate their succintness. </para>
+ <para>The style of man pages may be a little hard to get used to, because they are rather terse, particularly the older, very traditional ones. But once you get used to it, you come to appreciate their succinctness. </para>
<para>Please note that many Unix-like commands including ones from GNU and BSD will display brief help information if you invoke them in one of the following ways (or without any arguments in some cases): </para>
<screen>$ <commandname> --help
$ <commandname> -h
Reply to: