Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

[apt.git] / doc / dpkg-tech.sgml

diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 7c6e023ddff02998880a3189d5f5a54579014dd3..ce0c5fa83ce0d71cda969ce0e680d277526f659f 100644 (file)
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -21,7 +21,7 @@ by the Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
 
 <p>
-For more details, on Debian GNU/Linux systems, see the file
+For more details, on Debian systems, see the file
 /usr/share/common-licenses/GPL for the full license.
 </copyright>
 
@@ -164,7 +164,7 @@ not copied into here; it is instead found as part of status or available.
 <item>methods - this directory is reserved for "method"-specific files - each
 "method" has a subdirectory underneath this directory (or at least, it can
 have). In addition, there is another subdirectory "mnt", where misc.
-filesystems (floppies, CDROMs, etc.) are mounted.
+filesystems (floppies, CD-ROMs, etc.) are mounted.
 <item>alternatives - directory used by the "update-alternatives" program. It
 contains one file for each "alternatives" interface, which contains information
 about all the needed symlinked files for each alternative.
@@ -322,7 +322,7 @@ The main principal of the new-format Debian archive (I won't describe the old
 format - for that have a look at deb-old.5), is that the archive really is
 an archive - as used by "ar" and friends. However, dpkg-deb uses this format
 internally, rather than calling "ar". Inside this archive, there are usually
-the folowing members:-
+the following members:-
 
 <list>
 <item>debian-binary
@@ -349,7 +349,7 @@ supports the following options:-
 <item>--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
 contains all the files as an argument. Note that the directory
 &lt;dir&gt;/DEBIAN will be packed separately into the control archive.
-<item>--contents (-c) &lt;debfile&gt; - Lists the contents of ther "data.tar.gz"
+<item>--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
 member.
 <item>--control (-e) &lt;debfile&gt; - Extracts the control archive into a
 directory called DEBIAN. Alternatively, with another argument, it will extract
@@ -450,7 +450,7 @@ cleaned up when dpkg exits cleanly.
 
 <p>
 Juding by the use of the updates directory I would call it a Journal. Inorder
-to effeciently ensure the complete integrity of the status file dpkg will
+to efficiently ensure the complete integrity of the status file dpkg will
 "checkpoint" or journal all of it's activities in the updates directory. By
 merging the contents of the updates directory (in order!!) against the 
 original status file it can get the precise current state of the system,