Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 1a15f6a4c..ce0c5fa83 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -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,