Merge from trunk.

4 files changed, 4 insertions, 4 deletions

diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk
index 39ccc1c7dc1..b611def710d 100644
--- a/admin/charsets/cp51932.awk
+++ b/admin/charsets/cp51932.awk
@@ -20,7 +20,7 @@
 
 # Commentary:
 
-# Genereate a translation table for CP51932 (EUC-JP of MicroSoft Version).
+# Generate a translation table for CP51932 (EUC-JP of MicroSoft Version).
 # It maps invalid JISX0208 code points used by CP51932 to Unicode.
 # 4th field of the input has these meanings:
 #   0: JISX0208 characters.
diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy
index a0af813e5e8..b30305ee78a 100644
--- a/admin/grammars/python.wy
+++ b/admin/grammars/python.wy
@@ -828,7 +828,7 @@ paren_classes
   ;
 
 ;; In general, the base class can be specified by a general expression
-;; which evalue to a class object, i.e., base classes are not just names!
+;; which evaluates to a class object, i.e., base classes are not just names!
 ;; However base classes are names in most cases.  Thus the
 ;; non-terminals below work only with simple names.  Even if the
 ;; parser can parse general expressions, I don't see much benefit in
diff --git a/admin/notes/bzr b/admin/notes/bzr
index 12a3b194266..50eaf3710ee 100644
--- a/admin/notes/bzr
+++ b/admin/notes/bzr
@@ -173,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be
 very short).  This is because file gets re-added with a new file-id
 (use `bzr file-id file' to see the id).
 
-Insteading of adding the file, try:
+Instead of adding the file, try:
 
 bzr revert -rN file; bzr commit
 
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 5dee94f28c5..3c70ed8dbe0 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -92,7 +92,7 @@ See the end of the file for license conditions.
       or libpng.dll. LibPNG requires zlib, which should come from the same
       source as you got libpng.
 
-      JPEG: requires the Independant JPEG Group's libjpeg 6b or later,
+      JPEG: requires the Independent JPEG Group's libjpeg 6b or later,
       which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll.
 
       TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll