[PATCH] Fix various typos, spelling and grammar errors

Nick Andrew nick at nick-andrew.net
Tue Jun 24 00:37:33 UTC 2008


Fix various typos, spelling and grammar errors

Most of the fixed errors are in comments, but a few are in
messages from the system or build files.

Some examples:

- MogileFS.pm provides a the perl client for the MogileFS application-level
+ MogileFS.pm provides a perl client for the MogileFS application-level

-    ABSTRACT                => 'Plugin for mogilefs server represending a UNIX like filesystem on top of mogilefs.',
+    ABSTRACT                => 'Plugin for mogilefs server representing a UNIX like filesystem on top of mogilefs.',

-        des => "Comma-seperated list of filenames to load when a user visits a directory URL, listed in order of preference.",
+        des => "Comma-separated list of filenames to load when a user visits a directory URL, listed in order of preference.",

-                    "--weight=i" => "Postive numeric weight for device",
+                    "--weight=i" => "Positive numeric weight for device",

And so on...

Signed-off-by: Nick Andrew <nick at nick-andrew.net>
---

 .../lib/MogileFS/Client/FilePaths.pm               |    2 +-
 api/perl/MogileFS-Client/debian/control            |    2 +-
 api/perl/MogileFS-Client/lib/MogileFS/Backend.pm   |    2 +-
 api/perl/MogileFS-Client/lib/MogileFS/Client.pm    |    2 +-
 .../MogileFS-Client/lib/MogileFS/NewHTTPFile.pm    |    2 +-
 fuse/mount-filepaths                               |    2 +-
 .../MogileFS-Network/lib/MogileFS/Network.pm       |    2 +-
 .../MogileFS/ReplicationPolicy/MultipleNetworks.pm |    4 ++--
 .../MogileFS-Network/t/hosts-per-zone-replpol.t    |    4 ++--
 .../MogileFS-Plugin-FilePaths/Makefile.PL          |    2 +-
 .../MogileFS-Plugin-FilePaths.spec                 |    4 ++--
 .../lib/MogileFS/Plugin/FilePaths.pm               |    4 ++--
 server/CHANGES                                     |   20 ++++++++++----------
 server/MogileFS-Server.spec                        |    2 +-
 server/TODO                                        |    4 ++--
 server/debian/changelog                            |    2 +-
 server/debian/control                              |    2 +-
 server/doc/fsck-notes.txt                          |    2 +-
 server/doc/memcache-support.txt                    |    4 ++--
 server/doc/testing.txt                             |    2 +-
 server/lib/MogileFS/Config.pm                      |    4 ++--
 server/lib/MogileFS/Device.pm                      |    2 +-
 server/lib/MogileFS/Domain.pm                      |    2 +-
 server/lib/MogileFS/FID.pm                         |    2 +-
 server/lib/MogileFS/HTTPFile.pm                    |    2 +-
 server/lib/MogileFS/IOStatWatcher.pm               |    2 +-
 server/lib/MogileFS/ProcManager.pm                 |    6 +++---
 .../MogileFS/ReplicationPolicy/MultipleHosts.pm    |    2 +-
 server/lib/MogileFS/ReplicationPolicy/Union.pm     |    4 ++--
 server/lib/MogileFS/ReplicationRequest.pm          |    2 +-
 server/lib/MogileFS/Store.pm                       |    8 ++++----
 server/lib/MogileFS/Util.pm                        |    4 ++--
 server/lib/MogileFS/Worker.pm                      |    2 +-
 server/lib/MogileFS/Worker/Delete.pm               |    4 ++--
 server/lib/MogileFS/Worker/Query.pm                |   14 +++++++-------
 server/lib/MogileFS/Worker/Replicate.pm            |    8 ++++----
 server/lib/Mogstored/SideChannelClient.pm          |    2 +-
 server/lib/mogdeps/Danga/Socket.pm                 |   18 +++++++++---------
 .../lib/mogdeps/Gearman/Client/Async/Connection.pm |    2 +-
 server/lib/mogdeps/Gearman/ResponseParser.pm       |    2 +-
 server/lib/mogdeps/Gearman/Server/Client.pm        |    4 ++--
 server/lib/mogdeps/Gearman/Taskset.pm              |    2 +-
 server/lib/mogdeps/Gearman/Worker.pm               |    6 +++---
 server/lib/mogdeps/Perlbal.pm                      |    6 +++---
 server/lib/mogdeps/Perlbal/AIO.pm                  |    2 +-
 server/lib/mogdeps/Perlbal/BackendHTTP.pm          |    2 +-
 server/lib/mogdeps/Perlbal/ClientHTTP.pm           |    2 +-
 server/lib/mogdeps/Perlbal/ClientHTTPBase.pm       |    4 ++--
 server/lib/mogdeps/Perlbal/ClientProxy.pm          |   16 ++++++++--------
 server/lib/mogdeps/Perlbal/HTTPHeaders.pm          |    4 ++--
 server/lib/mogdeps/Perlbal/Plugin/Stats.pm         |    2 +-
 server/lib/mogdeps/Perlbal/Plugin/Vhosts.pm        |    4 ++--
 server/lib/mogdeps/Perlbal/Pool.pm                 |    2 +-
 server/lib/mogdeps/Perlbal/ReproxyManager.pm       |    2 +-
 server/lib/mogdeps/Perlbal/Service.pm              |   14 +++++++-------
 server/lib/mogdeps/Perlbal/Socket.pm               |    4 ++--
 server/lib/mogdeps/Perlbal/TCPListener.pm          |    2 +-
 server/lib/mogdeps/Sys/Syscall.pm                  |    4 ++--
 server/mogautomount                                |    2 +-
 server/mogilefsd                                   |    2 +-
 server/mogstored                                   |    4 ++--
 server/t/10-weighting.t                            |    2 +-
 server/t/20-filepaths.t                            |    2 +-
 server/t/mogstored-shutdown.t                      |    2 +-
 server/t/multiple-hosts-replpol.t                  |    2 +-
 utils/debian/control                               |    4 ++--
 utils/mogadm                                       |   10 +++++-----
 utils/mogtool                                      |   16 ++++++++--------
 68 files changed, 145 insertions(+), 145 deletions(-)


diff --git a/api/perl/MogileFS-Client-FilePaths/lib/MogileFS/Client/FilePaths.pm b/api/perl/MogileFS-Client-FilePaths/lib/MogileFS/Client/FilePaths.pm
index d90a1d4..0c09952 100644
--- a/api/perl/MogileFS-Client-FilePaths/lib/MogileFS/Client/FilePaths.pm
+++ b/api/perl/MogileFS-Client-FilePaths/lib/MogileFS/Client/FilePaths.pm
@@ -39,7 +39,7 @@ MogileFS::Client::FilePaths - Client library for use with FilePaths plugin in Mo
 This module is a subclass of the MogileFS::Client library, it provides a similar interface for extra functionality
 provided in the FilePaths plugin.
 
-All methods are inhereted and usable from the MogileFS::Client library, with only the exceptions listed below.
+All methods are inherited and usable from the MogileFS::Client library, with only the exceptions listed below.
 
 =cut
 
diff --git a/api/perl/MogileFS-Client/debian/control b/api/perl/MogileFS-Client/debian/control
index 7a00182..99bed3c 100644
--- a/api/perl/MogileFS-Client/debian/control
+++ b/api/perl/MogileFS-Client/debian/control
@@ -9,5 +9,5 @@ Package: libmogilefs-perl
 Architecture: all
 Depends: ${perl:Depends}, libio-stringy-perl, libwww-perl
 Description: perl client for MogileFS
- MogileFS.pm provides a the perl client for the MogileFS application-level 
+ MogileFS.pm provides a perl client for the MogileFS application-level 
  distributed filesystem.
diff --git a/api/perl/MogileFS-Client/lib/MogileFS/Backend.pm b/api/perl/MogileFS-Client/lib/MogileFS/Backend.pm
index a814f13..254cf59 100644
--- a/api/perl/MogileFS-Client/lib/MogileFS/Backend.pm
+++ b/api/perl/MogileFS-Client/lib/MogileFS/Backend.pm
@@ -12,7 +12,7 @@ use MogileFS::Client;
 
 use fields ('hosts',        # arrayref of "$host:$port" of mogilefsd servers
             'host_dead',    # "$host:$port" -> $time  (of last connect failure)
-            'lasterr',      # string: \w+ identifer of last error
+            'lasterr',      # string: \w+ identifier of last error
             'lasterrstr',   # string: english of last error
             'sock_cache',   # cached socket to mogilefsd tracker
             'pref_ip',      # hashref; { ip => preferred ip }
diff --git a/api/perl/MogileFS-Client/lib/MogileFS/Client.pm b/api/perl/MogileFS-Client/lib/MogileFS/Client.pm
index 529773d..8338c70 100644
--- a/api/perl/MogileFS-Client/lib/MogileFS/Client.pm
+++ b/api/perl/MogileFS-Client/lib/MogileFS/Client.pm
@@ -155,7 +155,7 @@ sub last_tracker {
 
 =head2 errstr
 
-Returns string representation of the last error that occured.  It
+Returns string representation of the last error that occurred.  It
 includes the error code (same as method 'errcode') and a space before
 the optional English error message.
 
diff --git a/api/perl/MogileFS-Client/lib/MogileFS/NewHTTPFile.pm b/api/perl/MogileFS-Client/lib/MogileFS/NewHTTPFile.pm
index c46b09a..201fd1b 100644
--- a/api/perl/MogileFS-Client/lib/MogileFS/NewHTTPFile.pm
+++ b/api/perl/MogileFS-Client/lib/MogileFS/NewHTTPFile.pm
@@ -179,7 +179,7 @@ sub _getline {
 }
 
 # abstracted write function that uses non-blocking I/O and checking for
-# writability to ensure that we don't get stuck doing a write if the
+# writeability to ensure that we don't get stuck doing a write if the
 # node we're talking to goes down.  also handles logic to fall back to
 # a backup node if we're on our first write and the first node is down.
 # this entire function is a blocking function, it just uses intelligent
diff --git a/fuse/mount-filepaths b/fuse/mount-filepaths
index 94099ea..3f29c8c 100755
--- a/fuse/mount-filepaths
+++ b/fuse/mount-filepaths
@@ -204,7 +204,7 @@ Options:
 
     --file-perms PERMS
         The default file permissions for all files in the mounted MogileFS
-        filesystem.  Since MogilefS does not store this information currently
+        filesystem.  Since MogileFS does not store this information currently
         it must be faked.
 
     --dir-perms PERMS
diff --git a/server-plugins/MogileFS-Network/lib/MogileFS/Network.pm b/server-plugins/MogileFS-Network/lib/MogileFS/Network.pm
index 3f9a520..f92a19f 100644
--- a/server-plugins/MogileFS-Network/lib/MogileFS/Network.pm
+++ b/server-plugins/MogileFS-Network/lib/MogileFS/Network.pm
@@ -75,7 +75,7 @@ sub check_cache {
     return 1;
 }
 
-# This is a seperate subroutine so I can redefine it at test time.
+# This is a separate subroutine so I can redefine it at test time.
 sub get_setting {
     my $key = shift;
     return MogileFS::Config->server_setting($key);
diff --git a/server-plugins/MogileFS-Network/lib/MogileFS/ReplicationPolicy/MultipleNetworks.pm b/server-plugins/MogileFS-Network/lib/MogileFS/ReplicationPolicy/MultipleNetworks.pm
index 1ad6398..6f4a56e 100644
--- a/server-plugins/MogileFS-Network/lib/MogileFS/ReplicationPolicy/MultipleNetworks.pm
+++ b/server-plugins/MogileFS-Network/lib/MogileFS/ReplicationPolicy/MultipleNetworks.pm
@@ -123,7 +123,7 @@ sub replicate_to {
     return TEMP_NO_ANSWER unless @all_dests;
 
     my @ideal         = grep { ! $skip_host{$_->hostid} } @all_dests;
-    # wrong network is less desparate than wrong host
+    # wrong network is less desperate than wrong host
     my @network_desp  = grep {   $skip_host{$_->hostid} &&
                                  $skip_host{$_->hostid} eq AVOIDNETWORK } @all_dests;
     my @host_desp     = grep {   $skip_host{$_->hostid} &&
@@ -160,7 +160,7 @@ sub unique_hosts_and_networks {
 
 {
     my %cache; # '192.168.0.0/24' => Net::Netmask->new2('192.168.0.0/24');
-    my $age;   # increments everytime we look
+    my $age;   # increments every time we look
 
     # turn a server ip into a network
     # defaults to /16 ranges
diff --git a/server-plugins/MogileFS-Network/t/hosts-per-zone-replpol.t b/server-plugins/MogileFS-Network/t/hosts-per-zone-replpol.t
index 2811d68..828ea46 100644
--- a/server-plugins/MogileFS-Network/t/hosts-per-zone-replpol.t
+++ b/server-plugins/MogileFS-Network/t/hosts-per-zone-replpol.t
@@ -20,7 +20,7 @@ is(rr("min=2  h1[d1=X d2=_] h2[d3=X d4=_]"),
 is(rr("min=2  h1[d1=X d2=_] h2[d3=_ d4=_]"),
    "ideal(3,4)", "need host2");
 
-# still needs to be on host2, even though 2 coies on host1
+# still needs to be on host2, even though 2 copies on host1
 is(rr("min=2  h1[d1=X d2=X] h2[d3=_ d4=_]"),
    "ideal(3,4)", "need host2, even though 2 on host1");
 
@@ -41,7 +41,7 @@ is(rr("min=2  h1[d1=_ d2=X,dead] h2=alive[d3=X d4=_]"),
    "ideal(1)");
 
 # minimum hosts is 3, only 2 available hosts. This test differs from
-# the one in multiplehosts because elavating these results to be 'ideal'
+# the one in multiplehosts because elevating these results to be 'ideal'
 # adds complexity that is unnecessary in my eyes.
 is(rr("min=3 h1[d1=_ d2=X] h2[d3=X d4=_]"),
    "desperate(1,4)");
diff --git a/server-plugins/MogileFS-Plugin-FilePaths/Makefile.PL b/server-plugins/MogileFS-Plugin-FilePaths/Makefile.PL
index 4122ea3..f7551c2 100644
--- a/server-plugins/MogileFS-Plugin-FilePaths/Makefile.PL
+++ b/server-plugins/MogileFS-Plugin-FilePaths/Makefile.PL
@@ -6,7 +6,7 @@ WriteMakefile(
     NAME                    => 'MogileFS-Plugin-FilePaths',
     VERSION_FROM            => 'lib/MogileFS/Plugin/FilePaths.pm',
     AUTHOR                  => 'Jonathan Steinert <hachi at cpan.org>',
-    ABSTRACT                => 'Plugin for mogilefs server represending a UNIX like filesystem on top of mogilefs.',
+    ABSTRACT                => 'Plugin for mogilefs server representing a UNIX like filesystem on top of mogilefs.',
     PREREQ_PM               => {
         'MogileFS::Plugin::MetaData'    => '0.01',
         'MogileFS::Server'              => '2.08',
diff --git a/server-plugins/MogileFS-Plugin-FilePaths/MogileFS-Plugin-FilePaths.spec b/server-plugins/MogileFS-Plugin-FilePaths/MogileFS-Plugin-FilePaths.spec
index 5759dd3..9de987a 100644
--- a/server-plugins/MogileFS-Plugin-FilePaths/MogileFS-Plugin-FilePaths.spec
+++ b/server-plugins/MogileFS-Plugin-FilePaths/MogileFS-Plugin-FilePaths.spec
@@ -1,5 +1,5 @@
 name:      perl-MogileFS-Plugin-FilePaths
-summary:   perl-MogileFS-Plugin-FilePaths - MogileFS Tracker plugin to reprepsent a traditional unix filesystem in mogilefs.
+summary:   perl-MogileFS-Plugin-FilePaths - MogileFS Tracker plugin to represent a traditional unix filesystem in mogilefs.
 version:   0.02
 release:   1
 vendor:    Jonathan Steinert <hachi at cpan.org>
@@ -12,7 +12,7 @@ source:    MogileFS-Plugin-FilePaths-%{version}.tar.gz
 requires:  perl-MogileFS-Plugin-FilePaths
 
 %description
-MogileFS Tracker plugin to reprepsent a traditional unix filesystem in mogilefs.
+MogileFS Tracker plugin to represent a traditional unix filesystem in mogilefs.
 
 %prep
 rm -rf "%{buildroot}"
diff --git a/server-plugins/MogileFS-Plugin-FilePaths/lib/MogileFS/Plugin/FilePaths.pm b/server-plugins/MogileFS-Plugin-FilePaths/lib/MogileFS/Plugin/FilePaths.pm
index 6449115..6924dc6 100644
--- a/server-plugins/MogileFS-Plugin-FilePaths/lib/MogileFS/Plugin/FilePaths.pm
+++ b/server-plugins/MogileFS-Plugin-FilePaths/lib/MogileFS/Plugin/FilePaths.pm
@@ -20,7 +20,7 @@ use MogileFS::Plugin::MetaData;
 # called when this plugin is loaded, this sub must return a true value in order for
 # MogileFS to consider the plugin to have loaded successfully.  if you return a
 # non-true value, you MUST NOT install any handlers or other changes to the system.
-# if you install something here, you MUST uninstall it in the unload sub.
+# if you install something here, you MUST un-install it in the unload sub.
 
 sub _parse_path {
     my $fullpath = shift;
@@ -278,7 +278,7 @@ sub load {
 }
 
 # this sub is called at the end or when the module is being unloaded, this needs to
-# unregister any registered methods, etc.  you MUST uninstall everything that the
+# unregister any registered methods, etc.  you MUST un-install everything that the
 # plugin has previously installed.
 sub unload {
 
diff --git a/server/CHANGES b/server/CHANGES
index 2d157a9..7dc8cd0 100644
--- a/server/CHANGES
+++ b/server/CHANGES
@@ -1,4 +1,4 @@
-        * Postgres locking routines did not include the hostname for the lock
+        * PostGres locking routines did not include the hostname for the lock
           release.
 
         * RFC 2518 says we "should" use a trailing slash when calling
@@ -11,7 +11,7 @@
 
         * Fix MultipleHosts replication policy to no longer return desperate
           devices after no longer being desperate, instead returning a state
-          which will queue for retries in the future till it can be truely
+          which will queue for retries in the future till it can be truly
           happy. This prevents files from being replicated to all writable
           devs when there are two few writable hosts to satisfy the policy.
 
@@ -77,12 +77,12 @@
 
         * Add a safety check to ensure that Postgresql-8.2 or newer is used.
 
-        * Update mogdbsetup usage, and ensure it choses the correct admin
+        * Update mogdbsetup usage, and ensure it chooses the correct admin
           username automatically.
 
         * Document the --type option to mogdbsetup.
 
-        * Introduce the Postgres Store implementation. The locking system might
+        * Introduce the PostGres Store implementation. The locking system might
           still have issues, beware of stale locks! Initial prototype by Radu
           Greab <rg at yx.ro>, and developed heavily by Robin H. Johnson
           <robbat2 at gentoo.org>.
@@ -99,13 +99,13 @@
           printf stuff works nicely.
 
         * The unix_timestamp function belongs to the Store, not other classes.
-          Need to add testcases for process_deletes and stats.
+          Need to add test cases for process_deletes and stats.
 
         * Using NULL during an INSERT for the AUTO_INCREMENT column does not
           work very well outside of MySQL. Pass the correct number of arguments
           to the INSERT instead.
 
-        * Clean up all raw usages of UNIX_TIMETAMP() function, in preparation
+        * Clean up all raw usages of UNIX_TIMESTAMP() function, in preparation
           for database independence. If you need the unix timestamp, include the output
           of $self->unix_timestamp directly into your query.
 
@@ -138,7 +138,7 @@
         * Fix get_paths to honor new device state of 'drain' via new
           DeviceStates interface.
 
-        * use signifigantly less CPU when re-broadcasting around
+        * use significantly less CPU when re-broadcasting around
           iostat device utilization% to child processes.  (future:
           don't rebroadcast at all and use shared memory)
 
@@ -279,7 +279,7 @@
           incomplete "Fsck" worker.
 
         * test cleanup/robustness improvements.  properly skips testing when
-          testin deps not found.  but searches harder for them now, too.
+          testing deps not found.  but searches harder for them now, too.
           tests run under "make disttest".
 
         * packaging cleanups, released using ShipIt.
@@ -300,7 +300,7 @@
         * mogilefsd: memcache support for get_paths (see doc/memcache-support.txt)
 
 2007-03-16:
-        * mogstored: make child processes be exec'ed (as as their own scripts, not inhertting
+        * mogstored: make child processes be exec'ed (as as their own scripts, not inheriting
           Perlbal, Linux::AIO/IO::AIO, etc baggage).  so they don't own listening
           sockets, pipes to child workers, signal handlers, etc.  just a lot
           cleaner now, and SIGTERM, SIGINT properly shut everything down now,
@@ -354,7 +354,7 @@
         * mogilefsd: major refactoring/cleanup/new features ("MogileFS 2.0")
 
 2006-03-01 (Brad)
-        * mogilefsd: fix dataloss bug when the 'tempfile' table is Innodb and the
+        * mogilefsd: fix dataloss bug when the 'tempfile' table is InnoDB and the
            server is restarted while the tempfile table is empty.
 
 2006-02-28 (Jr)
diff --git a/server/MogileFS-Server.spec b/server/MogileFS-Server.spec
index a0c6411..4550ea9 100644
--- a/server/MogileFS-Server.spec
+++ b/server/MogileFS-Server.spec
@@ -1,5 +1,5 @@
 name:      MogileFS-Server
-summary:   MoilgeFS-Server - MogileFS Server daemons and utilities.
+summary:   MogileFS-Server - MogileFS Server daemons and utilities.
 version:   2.17
 release:   1
 vendor:    Brad Fitzpatrick <brad at danga.com>
diff --git a/server/TODO b/server/TODO
index eacf91c..9c64c6b 100644
--- a/server/TODO
+++ b/server/TODO
@@ -1,7 +1,7 @@
--- if run out filedescriptors in mogilefsd, mogilefsd shouldn't crash.  it might
+-- if run out file descriptors in mogilefsd, mogilefsd shouldn't crash.  it might
    now.  needs a test.
 
--- change debug level at runtime from mgmt port, propogate to children.
+-- change debug level at runtime from mgmt port, propagate to children.
 
 -- MogileFS::Device ->make_directory on lighttpd isn't exactly right, as WebDAV
    spec says MKCOL on an existing directory should return 405 (Method Not Allowed),
diff --git a/server/debian/changelog b/server/debian/changelog
index 5d4f27f..856f881 100644
--- a/server/debian/changelog
+++ b/server/debian/changelog
@@ -1,6 +1,6 @@
 mogilefs-server (1.00-2) unstable; urgency=low
 
-  * fix dataloss bug when the 'tempfile' table is Innodb and the
+  * fix data loss bug when the 'tempfile' table is InnoDB and the
     server is restarted while the tempfile table is empty.
 
  -- Pavel Skaldin <pskaldin at sixapart.com>  Thu,  2 Mar 2006 17:12:51 -0800
diff --git a/server/debian/control b/server/debian/control
index c10a407..bd27427 100644
--- a/server/debian/control
+++ b/server/debian/control
@@ -19,7 +19,7 @@ Depends: ${perl:Depends}, debhelper (>= 4.1.40), libdbd-mysql-perl, libdbi-perl,
 Suggests: mogilefs-utils
 Description: scalable distributed filesystem from Danga Interactive
  MogileFS is an open-source, application-level distributed filesystem. It
- creates a host-nuetral, filesystem-agnostic method of distributing files
+ creates a host-neutral, filesystem-agnostic method of distributing files
  that has many advantages over NFS and single-machine raid.  This set
  of utilities is very scalable and can handle Livejournal.com's load, for
  which it was designed.
diff --git a/server/doc/fsck-notes.txt b/server/doc/fsck-notes.txt
index 2b15ec5..c82b2d8 100644
--- a/server/doc/fsck-notes.txt
+++ b/server/doc/fsck-notes.txt
@@ -28,7 +28,7 @@ CREATE TABLE fsck (
 # todo:  replication policy saying "not quite happy" goes into "needs_replicate" table for to-be-fixed-later
 # todo: stat command to get count of rows in needs_replicate  (!repl replacement)
 
-# provide command to drop fsck table to force global reindexing
+# provide command to drop fsck table to force global re-indexing
 # interface from fsck job to replicate job.  or do it ourselves sharing code.  (probably sharing code)
 # perhaps command-line version is just running:
 #    mogilefsd --run-only-job=fsck --foreground --verbose
diff --git a/server/doc/memcache-support.txt b/server/doc/memcache-support.txt
index de36fac..2160a56 100644
--- a/server/doc/memcache-support.txt
+++ b/server/doc/memcache-support.txt
@@ -5,7 +5,7 @@ load on the database.
 After years of saying it's stupid, I finally implemented it, but I
 still maintain it's (usually) stupid.
 
-Reall, you should cache get_paths requests in your application,
+Really, you should cache get_paths requests in your application,
 avoiding an extra round-trip to the trackers that could be avoided on
 a cache hit.
 
@@ -27,7 +27,7 @@ To use memcached support on get_paths requests, telnet to one of your trackers a
 
     set_server_setting key=memcache_servers&value=127.0.0.1:11211
 
-(where value is a comman-separated list, if you have multiple)
+(where value is a comma-separated list, if you have multiple)
 
 And then all future get_paths requests with noverify=1 (which now
 doubles as the "memcached is okay" flag) will use memcache.
diff --git a/server/doc/testing.txt b/server/doc/testing.txt
index 3a5f881..6a4fa90 100644
--- a/server/doc/testing.txt
+++ b/server/doc/testing.txt
@@ -25,7 +25,7 @@ $ psql -Upostgres
 
 Manual tests
 ============
-If you only want to run some part of the testsuite, or you want detailed
+If you only want to run some part of the test suite, or you want detailed
 output as to why a test failed, you can run as follows:
 $ MOGTEST_DBTYPE=<dbtype> perl -Ilib t/<foobar>.t
 Where dbtype is one of MySQL (default), PostGres.
diff --git a/server/lib/MogileFS/Config.pm b/server/lib/MogileFS/Config.pm
index b44ceee..7198219 100644
--- a/server/lib/MogileFS/Config.pm
+++ b/server/lib/MogileFS/Config.pm
@@ -23,7 +23,7 @@ sub set_config {
     shift if @_ == 3;
     my ($k, $v) = @_;
 
-    # if a child, propogate to parent
+    # if a child, propagate to parent
     if (my $worker = MogileFS::ProcManager->is_child) {
         $worker->send_to_parent(":set_config_from_child $k $v");
     } else {
@@ -131,7 +131,7 @@ sub load_config {
     }
 
     # Fill in defaults for those values which were either loaded from config or
-    # specified on the command line. Command line takes precendence, then values in
+    # specified on the command line. Command line takes precedence, then values in
     # the config file, then the defaults.
     $daemonize      = choose_value( 'daemonize', 0 );
     $db_dsn         = choose_value( 'db_dsn', "DBI:mysql:mogilefs" );
diff --git a/server/lib/MogileFS/Device.pm b/server/lib/MogileFS/Device.pm
index d9518b0..53c1cb5 100644
--- a/server/lib/MogileFS/Device.pm
+++ b/server/lib/MogileFS/Device.pm
@@ -373,7 +373,7 @@ sub create_directory {
     # if they don't support this method, remember that
     if ($ans && $ans =~ m!HTTP/1\.[01] (400|405|501)!) {
         $self->{no_mkcol} = 1;
-        # TODO: move this into method on device, which propogates to parent
+        # TODO: move this into method on device, which propagates to parent
         # and also receive from parent.  so all query workers share this knowledge
         return 1;
     }
diff --git a/server/lib/MogileFS/Domain.pm b/server/lib/MogileFS/Domain.pm
index fb9b5b5..2130d6e 100644
--- a/server/lib/MogileFS/Domain.pm
+++ b/server/lib/MogileFS/Domain.pm
@@ -74,7 +74,7 @@ sub reload_domains {
 # FIXME: should probably have an invalidate_cache variant that only
 # flushes locally (for things like "get_domains" or "get_hosts", where
 # it needs to be locally correct for the semantics of the command, but
-# no need to propogate a cache invalidation to our peers)
+# no need to propagate a cache invalidation to our peers)
 sub invalidate_cache {
     $last_load = 0;
     %id2name = ();
diff --git a/server/lib/MogileFS/FID.pm b/server/lib/MogileFS/FID.pm
index c13b2dc..b0334ae 100644
--- a/server/lib/MogileFS/FID.pm
+++ b/server/lib/MogileFS/FID.pm
@@ -149,7 +149,7 @@ sub rename {
 
 # returns array of devids that this fid is on
 # NOTE: TODO: by default, this doesn't cache.  callers might be surprised from
-#   having an old version later on.  before caching is added, auditting needs
+#   having an old version later on.  before caching is added, auditing needs
 #   to be done.
 sub devids {
     my $self = shift;
diff --git a/server/lib/MogileFS/HTTPFile.pm b/server/lib/MogileFS/HTTPFile.pm
index c6634df..c439a47 100644
--- a/server/lib/MogileFS/HTTPFile.pm
+++ b/server/lib/MogileFS/HTTPFile.pm
@@ -124,7 +124,7 @@ sub size {
     my $self = shift;
     my ($host, $port, $uri, $path) = map { $self->{$_} } qw(host port uri url);
 
-    # don't sigpipe us
+    # don't SIGPIPE us
     my $flag_nosignal = MogileFS::Sys->flag_nosignal;
     local $SIG{'PIPE'} = "IGNORE" unless $flag_nosignal;
 
diff --git a/server/lib/MogileFS/IOStatWatcher.pm b/server/lib/MogileFS/IOStatWatcher.pm
index e2671f0..40beee9 100644
--- a/server/lib/MogileFS/IOStatWatcher.pm
+++ b/server/lib/MogileFS/IOStatWatcher.pm
@@ -26,7 +26,7 @@ sub new {
 Sets the list of hosts to connect to for collecting IOStat information. This call can block if you
 pass it hostnames instead of ip addresses.
 
-Upon successfull connection, the on_stats callback will be called each time the statistics are
+Upon successful connection, the on_stats callback will be called each time the statistics are
 collected. Error states (failed connections, etc.) will trigger retries on 60 second intervals, and
 disconnects will trigger an immediate reconnect.
 
diff --git a/server/lib/MogileFS/ProcManager.pm b/server/lib/MogileFS/ProcManager.pm
index 90b564d..de59da3 100644
--- a/server/lib/MogileFS/ProcManager.pm
+++ b/server/lib/MogileFS/ProcManager.pm
@@ -8,7 +8,7 @@ use MogileFS::Connection::Client;
 use MogileFS::Connection::Worker;
 
 # This class handles keeping lists of workers and clients and
-# assigning them to eachother when things happen.  You don't actually
+# assigning them to each other when things happen.  You don't actually
 # instantiate a procmanager.  the class itself holds all state.
 
 # Mappings: fd => [ clientref, jobstring, starttime ]
@@ -531,7 +531,7 @@ Mogilefsd admin commands:
 
     !replication
                 (Deprecated/old)
-                See the replication status for unreplicated files.
+                See the replication status for un-replicated files.
                 Output format:
                 <domain> <class> <devcount> <files>
 
@@ -577,7 +577,7 @@ sub HandleChildRequest {
 
     } elsif ($cmd =~ /^:repl_unreachable (\d+)/) {
         # announce to the other replicators that this fid can't be reached, but note
-        # that we don't actually drain the queue to the requestor, as the replicator
+        # that we don't actually drain the queue to the requester, as the replicator
         # isn't in a place where it can accept a queue drain right now.
         MogileFS::ProcManager->ImmediateSendToChildrenByJob('replicate', "repl_unreachable $1", $child);
 
diff --git a/server/lib/MogileFS/ReplicationPolicy/MultipleHosts.pm b/server/lib/MogileFS/ReplicationPolicy/MultipleHosts.pm
index a9a1a46..2df73dd 100644
--- a/server/lib/MogileFS/ReplicationPolicy/MultipleHosts.pm
+++ b/server/lib/MogileFS/ReplicationPolicy/MultipleHosts.pm
@@ -32,7 +32,7 @@ sub replicate_to {
 
     # this is the per-class mindevcount (the old way), which is passed in automatically
     # from the replication worker.  but if we have our own configured mindevcount
-    # in class.replpolicy, like "MultipleHosts(3)", then we use the explciit one. otherwise,
+    # in class.replpolicy, like "MultipleHosts(3)", then we use the explicit one. otherwise,
     # if blank, or zero, like "MultipleHosts()", then we use the builtin on
     my $min      = delete $args{min};
     $min         = $self->{mindevcount} || $min;
diff --git a/server/lib/MogileFS/ReplicationPolicy/Union.pm b/server/lib/MogileFS/ReplicationPolicy/Union.pm
index 50a69cc..28958ab 100644
--- a/server/lib/MogileFS/ReplicationPolicy/Union.pm
+++ b/server/lib/MogileFS/ReplicationPolicy/Union.pm
@@ -38,11 +38,11 @@ __END__
 
 =head1 NAME
 
-MogileFS::ReplicationPolicy::Union -- satisify 2 or more replication policies
+MogileFS::ReplicationPolicy::Union -- satisfy 2 or more replication policies
 
 =head1 RULES
 
-Use this replication policy to satisify multiple replication policies.
+Use this replication policy to satisfy multiple replication policies.
 For instance:
 
     Union(MultipleHosts(3), OnDevice(7))
diff --git a/server/lib/MogileFS/ReplicationRequest.pm b/server/lib/MogileFS/ReplicationRequest.pm
index 73dc54f..625df01 100644
--- a/server/lib/MogileFS/ReplicationRequest.pm
+++ b/server/lib/MogileFS/ReplicationRequest.pm
@@ -59,7 +59,7 @@ sub temp_fail {
 }
 
 # returns array of MogileFS::Device objs, in preferred order, one of
-# which (but not multiple) would satisify the replication policy
+# which (but not multiple) would satisfy the replication policy
 # for its next step.  at which point the replication policy needs
 # to be asked again what the next step is.
 sub copy_to_one_of_ideally {
diff --git a/server/lib/MogileFS/Store.pm b/server/lib/MogileFS/Store.pm
index 9e6e4a6..171693c 100644
--- a/server/lib/MogileFS/Store.pm
+++ b/server/lib/MogileFS/Store.pm
@@ -328,7 +328,7 @@ sub insert_ignore {
         if ($@ || $dbh->err) {
             return 1 if $self->was_duplicate_error;
             # This chunk is identical to condthrow, but we include it directly
-            # here as we know there is definetly an error, and we would like
+            # here as we know there is definitely an error, and we would like
             # the caller of this function.
             my ($pkg, $fn, $line) = caller;
             my $msg = "Database error from $pkg/$fn/$line: " . $dbh->errstr;
@@ -595,7 +595,7 @@ sub TABLE_file_to_replicate {
     # nexttry is time to try to replicate it next.
     #   0 means immediate.  it's only on one host.
     #   1 means lower priority.  it's on 2+ but isn't happy where it's at.
-    #   unixtimestamp means at/after that time.  some previous error occurred.
+    #   unix timestamp means at/after that time.  some previous error occurred.
     # fromdevid, if not null, means which devid we should replicate from.  perhaps it's the only non-corrupt one.  otherwise, wherever.
     # failcount.  how many times we've failed, just for doing backoff of nexttry.
     # flags.  reserved for future use.
@@ -1002,7 +1002,7 @@ sub rename_file {
                  undef, $to_key, $fidid);
     };
     if ($@ || $dbh->err) {
-        # first is mysql's error code for duplicates
+        # first is MySQL's error code for duplicates
         if ($self->was_duplicate_error) {
             return 0;
         } else {
@@ -1475,7 +1475,7 @@ sub random_fids_on_device {
     my $dbh = $self->dbh;
 
     # FIXME: this blows. not random.  and good chances these will
-    # eventually get to point where they're un-rebalanacable, and we
+    # eventually get to point where they're un-rebalance-able, and we
     # never move on past the first 5000
     my @some_fids = List::Util::shuffle(@{
         $dbh->selectcol_arrayref("SELECT fid FROM file_on WHERE devid=? LIMIT 5000",
diff --git a/server/lib/MogileFS/Util.pm b/server/lib/MogileFS/Util.pm
index be1cca9..774e9f5 100644
--- a/server/lib/MogileFS/Util.pm
+++ b/server/lib/MogileFS/Util.pm
@@ -122,7 +122,7 @@ sub daemonize {
     croak "Cannot detach from controlling terminal"
         unless $sess_id = POSIX::setsid();
 
-    ## Prevent possibility of acquiring a controling terminal
+    ## Prevent possibility of acquiring a controlling terminal
     $SIG{'HUP'} = 'IGNORE';
     if ($pid = fork) { exit 0; }
 
@@ -139,7 +139,7 @@ sub daemonize {
     close(STDOUT);
     close(STDERR);
 
-    ## Reopen stderr, stdout, stdin to /dev/null
+    ## Reopen STDERR, STDOUT, STDIN to /dev/null
     if ( $MogileFS::DEBUG ) {
         open(STDIN,  "+>/tmp/mogilefsd.log");
     } else {
diff --git a/server/lib/MogileFS/Worker.pm b/server/lib/MogileFS/Worker.pm
index b4774db..7547910 100644
--- a/server/lib/MogileFS/Worker.pm
+++ b/server/lib/MogileFS/Worker.pm
@@ -221,7 +221,7 @@ sub invalidate_meta {
 }
 
 # tries to parse generic (not job-specific) commands sent from parent
-# to child.  returns 1 on success, or 0 if comman given isn't generic,
+# to child.  returns 1 on success, or 0 if command given isn't generic,
 # and child should parse.
 # lineref doesn't have \r\n at end.
 sub process_generic_command {
diff --git a/server/lib/MogileFS/Worker/Delete.pm b/server/lib/MogileFS/Worker/Delete.pm
index c6840a6..d04c993 100644
--- a/server/lib/MogileFS/Worker/Delete.pm
+++ b/server/lib/MogileFS/Worker/Delete.pm
@@ -6,7 +6,7 @@ use base 'MogileFS::Worker';
 use MogileFS::Util qw(error);
 
 # we select 1000 but only do a random 100 of them, to allow
-# for stateless paralleism
+# for stateless parallelism
 use constant LIMIT => 1000;
 use constant PER_BATCH => 100;
 
@@ -77,7 +77,7 @@ sub process_tempfiles {
 
     # BUT NOTE:
     #    the fids might exist on one of the devices in devids column if we assigned them those,
-    #    they wrote some to one of them, then they died or for wahtever reason didn't create_close
+    #    they wrote some to one of them, then they died or for whatever reason didn't create_close
     #    to use, so we shouldn't delete from tempfile before going on a hunt of the missing fid.
     #    perhaps we should just add to the file_on table for both devids, and let the regular delete
     #    process discover via 404 that they're not there.
diff --git a/server/lib/MogileFS/Worker/Query.pm b/server/lib/MogileFS/Worker/Query.pm
index d0eb9e8..6597fbb 100644
--- a/server/lib/MogileFS/Worker/Query.pm
+++ b/server/lib/MogileFS/Worker/Query.pm
@@ -250,7 +250,7 @@ sub cmd_create_open {
     }
 
     # find suitable device(s) to put this file on.
-    my @dests; # MogileFS::Device objects which are suitabke
+    my @dests; # MogileFS::Device objects which are suitable
 
     while (scalar(@dests) < ($multi ? 3 : 1)) {
         my $ddev = shift @devices;
@@ -737,7 +737,7 @@ sub cmd_create_host {
 
     my $host = MogileFS::Host->of_hostname($hostname);
 
-    # if we're createing a new host, require ip/port, and default to
+    # if we're creating a new host, require ip/port, and default to
     # host being down if client didn't specify
     if ($args->{update}) {
         return $self->err_line('host_not_found') unless $host;
@@ -1161,7 +1161,7 @@ sub cmd_set_state {
     return $self->ok_line;
 }
 
-# FIXME: this whole thing is gross, duplicative, dependendent on $dbh, and doesn't scale.
+# FIXME: this whole thing is gross, duplicative, dependent on $dbh, and doesn't scale.
 # stats needs total overhaul to not suck.
 sub cmd_stats {
     my MogileFS::Worker::Query $self = shift;
@@ -1266,7 +1266,7 @@ sub cmd_stats {
         $ret->{"devicescount"} = $count;
     }
 
-    # now fid statitics
+    # now fid statistics
     if ($args->{fids} || $args->{all}) {
         my $max = $dbh->selectrow_array('SELECT MAX(fid) FROM file');
         $ret->{"fidmax"} = $max;
@@ -1479,7 +1479,7 @@ sub cmd_fsck_status {
         $ret->{"num_$1"} += $ss->{$k};
     }
 
-    # add in any stats which might not've been summarized yet.,,
+    # add in any stats which might have not been summarized yet.,,
     my $max_logid = $sto->max_fsck_logid;
     my $min_logid = MogileFS::Util::max($intss->("fsck_start_maxlogid"),
                                         $max_logid - ($max_logid % $sto->fsck_log_summarize_every)) + 1;
@@ -1519,10 +1519,10 @@ sub err_line {
         'after_mismatch' => "Pattern does not match the after-value?",
         'bad_params' => "Invalid parameters to command; please see documentation",
         'class_exists' => "That class already exists in that domain",
-        'class_has_files' => "Class still has files, uanble to delete",
+        'class_has_files' => "Class still has files, unable to delete",
         'class_not_found' => "Class not found",
         'db' => "Database error",
-        'domain_has_files' => "Domain still has files, uanble to delete",
+        'domain_has_files' => "Domain still has files, unable to delete",
         'domain_exists' => "That domain already exists",
         'domain_not_empty' => "Domain still has classes, unable to delete",
         'domain_not_found' => "Domain not found",
diff --git a/server/lib/MogileFS/Worker/Replicate.pm b/server/lib/MogileFS/Worker/Replicate.pm
index f37f1d0..d28b687 100644
--- a/server/lib/MogileFS/Worker/Replicate.pm
+++ b/server/lib/MogileFS/Worker/Replicate.pm
@@ -249,7 +249,7 @@ sub replicate_using_devcounts {
     my $sto = Mgd::get_store();
     return 0 unless $sto->isa("MogileFS::Store::MySQL");
 
-    # call this $mdbh to indiciate it's a MySQL dbh, and to help grepping
+    # call this $mdbh to indicate it's a MySQL dbh, and to help grepping
     # for old handles.  :)
     my $mdbh = $sto->dbh;
 
@@ -400,7 +400,7 @@ sub rebalance_devfid {
     # bail out early if this FID is no longer in the namespace (weird
     # case where file is in file_on because not yet deleted, but
     # has been replaced/deleted in 'file' table...).  not too harmful
-    # (just nosiy) if thise line didn't exist, but whatever... it
+    # (just noisy) if this line didn't exist, but whatever... it
     # makes stuff cleaner on my intentionally-corrupted-for-fsck-testing
     # dev machine...
     return 1 if ! $fid->exists;
@@ -433,7 +433,7 @@ sub rebalance_devfid {
         # lost the race because the replication policy said there's
         # nothing to do, even with this devfid masked away.
         # so let's figure it out... if this devfid still exists,
-        # we're overreplicated, else we just lost the race.
+        # we're over-replicated, else we just lost the race.
         if ($devfid->exists) {
             # over-replicated
 
@@ -596,7 +596,7 @@ sub replicate {
 
         last if $rr->is_happy;
 
-        my @ddevs;  # dest devs, in order of preferrence
+        my @ddevs;  # dest devs, in order of preference
         my $ddevid; # dest devid we've chosen to copy to
         if (@ddevs = $rr->copy_to_one_of_ideally) {
             if (my @not_masked_ids = (grep { ! $mask_devids->{$_} &&
diff --git a/server/lib/Mogstored/SideChannelClient.pm b/server/lib/Mogstored/SideChannelClient.pm
index 2c40516..f8efcb3 100644
--- a/server/lib/Mogstored/SideChannelClient.pm
+++ b/server/lib/Mogstored/SideChannelClient.pm
@@ -93,7 +93,7 @@ sub event_read {
     }
 }
 
-# stop watching writability if we've nothing else to
+# stop watching writeability if we've nothing else to
 # write to them.  else just kick off more writes.
 sub event_write {
     my $self = shift;
diff --git a/server/lib/mogdeps/Danga/Socket.pm b/server/lib/mogdeps/Danga/Socket.pm
index a666cff..fa5c9ca 100644
--- a/server/lib/mogdeps/Danga/Socket.pm
+++ b/server/lib/mogdeps/Danga/Socket.pm
@@ -38,7 +38,7 @@ Danga::Socket - Event loop and event-driven async socket base class
   # read max $bytecount bytes, or undef on connection closed
   $scalar_ref = $my_sock->read($bytecount);
 
-  # watch for writability.  not needed with ->write().  write()
+  # watch for writeability.  not needed with ->write().  write()
   # will automatically turn on watch_write when you wrote too much
   # and turn it off when done
   $my_sock->watch_write($bool);
@@ -66,7 +66,7 @@ and an event loop.
 
 Callers subclass Danga::Socket.  Danga::Socket's constructor registers
 itself with the Danga::Socket event loop, and invokes callbacks on the
-object for readability, writability, errors, and other conditions.
+object for readability, writeability, errors, and other conditions.
 
 Because Danga::Socket uses the "fields" module, your subclasses must
 too.
@@ -523,7 +523,7 @@ sub EpollEventLoop {
                 next;
             }
 
-            # standard non-profiling codepat
+            # standard non-profiling code path
             $pob->event_read   if $state & EPOLLIN && ! $pob->{closed};
             $pob->event_write  if $state & EPOLLOUT && ! $pob->{closed};
             if ($state & (EPOLLERR|EPOLLHUP)) {
@@ -549,7 +549,7 @@ sub PollEventLoop {
         # the following sets up @poll as a series of ($poll,$event_mask)
         # items, then uses IO::Poll::_poll, implemented in XS, which
         # modifies the array in place with the even elements being
-        # replaced with the event masks that occured.
+        # replaced with the event masks that occurred.
         my @poll;
         foreach my $fd ( keys %OtherFds ) {
             push @poll, $fd, POLLIN;
@@ -1007,7 +1007,7 @@ sub write {
                 }
                 $bref->();
 
-                # code refs are just run and never get reenqueued
+                # code refs are just run and never get re-enqueued
                 # (they're one-shot), so turn off the flag indicating the
                 # outstanding data needs queueing.
                 $need_queue = 0;
@@ -1144,7 +1144,7 @@ sub read {
 
 =head2 (VIRTUAL) C<< $obj->event_read() >>
 
-Readable event handler. Concrete deriviatives of Danga::Socket should
+Readable event handler. Concrete derivatives of Danga::Socket should
 provide an implementation of this. The default implementation will die if
 called.
 
@@ -1153,7 +1153,7 @@ sub event_read  { die "Base class event_read called for $_[0]\n"; }
 
 =head2 (VIRTUAL) C<< $obj->event_err() >>
 
-Error event handler. Concrete deriviatives of Danga::Socket should
+Error event handler. Concrete derivatives of Danga::Socket should
 provide an implementation of this. The default implementation will die if
 called.
 
@@ -1162,7 +1162,7 @@ sub event_err   { die "Base class event_err called for $_[0]\n"; }
 
 =head2 (VIRTUAL) C<< $obj->event_hup() >>
 
-'Hangup' event handler. Concrete deriviatives of Danga::Socket should
+'Hangup' event handler. Concrete derivatives of Danga::Socket should
 provide an implementation of this. The default implementation will die if
 called.
 
@@ -1171,7 +1171,7 @@ sub event_hup   { die "Base class event_hup called for $_[0]\n"; }
 
 =head2 C<< $obj->event_write() >>
 
-Writable event handler. Concrete deriviatives of Danga::Socket may wish to
+Writable event handler. Concrete derivatives of Danga::Socket may wish to
 provide an implementation of this. The default implementation calls
 C<write()> with an C<undef>.
 
diff --git a/server/lib/mogdeps/Gearman/Client/Async/Connection.pm b/server/lib/mogdeps/Gearman/Client/Async/Connection.pm
index 6f3d7e4..1dd662d 100644
--- a/server/lib/mogdeps/Gearman/Client/Async/Connection.pm
+++ b/server/lib/mogdeps/Gearman/Client/Async/Connection.pm
@@ -124,7 +124,7 @@ sub connect {
     });
 
     # unless we're faking being offline for the test suite, connect and watch
-    # for writabilty so we know the connect worked...
+    # for writeability so we know the connect worked...
     unless ($self->{t_offline}) {
         $self->watch_write(1);
     }
diff --git a/server/lib/mogdeps/Gearman/ResponseParser.pm b/server/lib/mogdeps/Gearman/ResponseParser.pm
index 8a70de1..ada6444 100644
--- a/server/lib/mogdeps/Gearman/ResponseParser.pm
+++ b/server/lib/mogdeps/Gearman/ResponseParser.pm
@@ -44,7 +44,7 @@ sub reset {
 
 # don't override:
 # FUTURE OPTIMIZATION: let caller say "you can own this scalarref", and then we can keep it
-#  on the initial settin of $self->{data} and avoid copying into our own.  overkill for now.
+#  on the initial setting of $self->{data} and avoid copying into our own.  overkill for now.
 sub parse_data {
     my ($self, $data) = @_;  # where $data is a scalar or scalarref to parse
     my $dataref = ref $data ? $data : \$data;
diff --git a/server/lib/mogdeps/Gearman/Server/Client.pm b/server/lib/mogdeps/Gearman/Server/Client.pm
index 9892372..fc36111 100644
--- a/server/lib/mogdeps/Gearman/Server/Client.pm
+++ b/server/lib/mogdeps/Gearman/Server/Client.pm
@@ -418,7 +418,7 @@ sub event_hup { my $self = shift; $self->close; }
 
 =head1 Line based commands
 
-These commands are used for administrative or statistic tasks to be done on the gearman server. They can be entered using a line based client (telnet, etc.) by connecting to the listening port (7003) and are also intended to be machine parsable.
+These commands are used for administrative or statistic tasks to be done on the gearman server. They can be entered using a line based client (telnet, etc.) by connecting to the listening port (7003) and are also intended to be machine parseable.
 
 =head2 "workers"
 
@@ -446,7 +446,7 @@ sub TXTCMD_workers {
 
 =head2 "status"
 
-The output format of this function is tab separated columns as follows, followed by a line consisting of a fullstop and a newline (".\n") to indicate the end of output.
+The output format of this function is tab separated columns as follows, followed by a line consisting of a full stop and a newline (".\n") to indicate the end of output.
 
 =over
 
diff --git a/server/lib/mogdeps/Gearman/Taskset.pm b/server/lib/mogdeps/Gearman/Taskset.pm
index baec33f..b951b01 100644
--- a/server/lib/mogdeps/Gearman/Taskset.pm
+++ b/server/lib/mogdeps/Gearman/Taskset.pm
@@ -154,7 +154,7 @@ sub wait {
 
             if ($@) {
                 # TODO this should remove the fd from the list, and reassign any tasks to other jobserver, or bail.
-                # We're not in an accessable place here, so if all job servers fail we must die to prevent hanging.
+                # We're not in an accessible place here, so if all job servers fail we must die to prevent hanging.
                 die( "Job server failure: $@" );
             }
         }
diff --git a/server/lib/mogdeps/Gearman/Worker.pm b/server/lib/mogdeps/Gearman/Worker.pm
index b4d7be2..dae5b8a 100644
--- a/server/lib/mogdeps/Gearman/Worker.pm
+++ b/server/lib/mogdeps/Gearman/Worker.pm
@@ -71,7 +71,7 @@ use fields (
             'connecting',        # host:port -> unixtime connect started at
             'can',               # func -> subref
             'timeouts',          # func -> timeouts
-            'client_id',         # random identifer string, no whitespace
+            'client_id',         # random identifier string, no whitespace
             'parent_pipe',       # bool/obj:  if we're a child process of a gearman server,
                                  #   this is socket to our parent process.  also means parent
                                  #   sock can never disconnect or timeout, etc..
@@ -220,7 +220,7 @@ sub uncache_sock {
     # parent process respawns us...
     die "Error/timeout talking to gearman parent process: [$reason]" if $self->{parent_pipe};
 
-    # normal case, we just close this TCP connectiona and we'll reconnect later.
+    # normal case, we just close this TCP connection and we'll reconnect later.
     delete $self->{sock_cache}{$ipport};
 }
 
@@ -503,7 +503,7 @@ instances of the same application (different development sandboxes for
 example).
 
 The namespace is currently implemented as a simple tab separated
-concatentation of the prefix and the function name.
+concatenation of the prefix and the function name.
 
 =head2 Gearman::Job->arg
 
diff --git a/server/lib/mogdeps/Perlbal.pm b/server/lib/mogdeps/Perlbal.pm
index b7faf3e..f7f0dff 100644
--- a/server/lib/mogdeps/Perlbal.pm
+++ b/server/lib/mogdeps/Perlbal.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
@@ -14,7 +14,7 @@ Perlbal - Reverse-proxy load balancer and webserver
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2004, Danga Interactice, Inc.
+Copyright 2004, Danga Interactive, Inc.
 Copyright 2005-2006, Six Apart, Ltd.
 
 You can use and redistribute Perlbal under the same terms as Perl itself.
@@ -1117,7 +1117,7 @@ sub daemonize {
     croak "Cannot detach from controlling terminal"
         unless $sess_id = POSIX::setsid();
 
-    ## Prevent possibility of acquiring a controling terminal
+    ## Prevent possibility of acquiring a controlling terminal
     $SIG{'HUP'} = 'IGNORE';
     if ($pid = fork) { exit 0; }
 
diff --git a/server/lib/mogdeps/Perlbal/AIO.pm b/server/lib/mogdeps/Perlbal/AIO.pm
index b086133..d7746b2 100644
--- a/server/lib/mogdeps/Perlbal/AIO.pm
+++ b/server/lib/mogdeps/Perlbal/AIO.pm
@@ -1,6 +1,6 @@
 # AIO abstraction layer
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 
 package Perlbal::AIO;
diff --git a/server/lib/mogdeps/Perlbal/BackendHTTP.pm b/server/lib/mogdeps/Perlbal/BackendHTTP.pm
index dc59154..fca3c28 100644
--- a/server/lib/mogdeps/Perlbal/BackendHTTP.pm
+++ b/server/lib/mogdeps/Perlbal/BackendHTTP.pm
@@ -1,7 +1,7 @@
 ######################################################################
 # HTTP connection to backend node
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
diff --git a/server/lib/mogdeps/Perlbal/ClientHTTP.pm b/server/lib/mogdeps/Perlbal/ClientHTTP.pm
index 632e3b2..81d1a4b 100644
--- a/server/lib/mogdeps/Perlbal/ClientHTTP.pm
+++ b/server/lib/mogdeps/Perlbal/ClientHTTP.pm
@@ -2,7 +2,7 @@
 # HTTP Connection from a reverse proxy client.  GET/HEAD only.
 #  most functionality is implemented in the base class.
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
diff --git a/server/lib/mogdeps/Perlbal/ClientHTTPBase.pm b/server/lib/mogdeps/Perlbal/ClientHTTPBase.pm
index 4cb4a3c..51803b3 100644
--- a/server/lib/mogdeps/Perlbal/ClientHTTPBase.pm
+++ b/server/lib/mogdeps/Perlbal/ClientHTTPBase.pm
@@ -7,7 +7,7 @@
 # both paths can then go into persist_wait, which means they're waiting
 # for another request from the user
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 
 package Perlbal::ClientHTTPBase;
@@ -584,7 +584,7 @@ sub _serve_request_multiple_poststat {
         $ims_len = $1;
     }
 
-    # What is -f _ doing here? don't we detect the existance of all files above in the loop?
+    # What is -f _ doing here? don't we detect the existence of all files above in the loop?
     my $not_mod = $ims eq $lastmod && -f _;
 
     my $res;
diff --git a/server/lib/mogdeps/Perlbal/ClientProxy.pm b/server/lib/mogdeps/Perlbal/ClientProxy.pm
index c35b801..ad78cec 100644
--- a/server/lib/mogdeps/Perlbal/ClientProxy.pm
+++ b/server/lib/mogdeps/Perlbal/ClientProxy.pm
@@ -1,7 +1,7 @@
 ######################################################################
 # HTTP Connection from a reverse proxy client
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 package Perlbal::ClientProxy;
@@ -198,8 +198,8 @@ sub too_far_behind_backend {
     # ReproxyManager-created backend, and thus it should use the
     # 'buffer_size_reproxy_url' parameter for acceptable buffer
     # widths, and not the regular 'buffer_size'.  this lets people
-    # tune buffers depending on the types of webservers.  (assumption
-    # being that reproxied-to webservers are event-based and it's okay
+    # tune buffers depending on the types of web servers.  (assumption
+    # being that reproxied-to web servers are event-based and it's okay
     # to tie the up longer in favor of using less buffer memory in
     # perlbal)
     my $max_buffer = defined $backend->{service} ?
@@ -317,7 +317,7 @@ sub start_reproxy_file {
         }
 
         # if the thing we're reproxying is indeed a file, advertise that
-        # we support byteranges on it
+        # we support byte ranges on it
         if (-f _) {
             $hd->header("Accept-Ranges", "bytes");
         }
@@ -427,7 +427,7 @@ sub backend_finished {
     my Perlbal::ClientProxy $self = shift;
     print "ClientProxy::backend_finished\n" if Perlbal::DEBUG >= 3;
 
-    # mark ourselves as having responded (presumeably if we're here,
+    # mark ourselves as having responded (presumably if we're here,
     # the backend has responded already)
     $self->{responded} = 1;
 
@@ -439,7 +439,7 @@ sub backend_finished {
     return $self->http_response_sent unless $self->{unread_data_waiting};
 
     # if we get here (and we do, rarely, in practice) then that means
-    # the backend read was empty/disconected (or otherwise messed up),
+    # the backend read was empty/disconnected (or otherwise messed up),
     # and the only thing we can really do is close the client down.
     $self->close("backend_finished_while_unread_data");
 }
@@ -1105,7 +1105,7 @@ sub buffered_upload_update {
         $self->{buoutpos} += $bytes;
 
         # now check if we wrote less than we had in this chunk of buffer.  if that's
-        # the case then we need to reenqueue the part of the chunk that wasn't
+        # the case then we need to re-enqueue the part of the chunk that wasn't
         # written out and update as appropriate.
         if ($bytes < $len) {
             my $diff = $len - $bytes;
@@ -1156,7 +1156,7 @@ sub purge_buffered_upload {
     $self->{bufh} = undef;
 
     eval {
-        # now asyncronously unlink the file
+        # now asynchronously unlink the file
         Perlbal::AIO::aio_unlink($self->{bufilename}, sub {
             if ($!) {
                 # note an error, but whatever, we'll either overwrite the file later (O_TRUNC | O_CREAT)
diff --git a/server/lib/mogdeps/Perlbal/HTTPHeaders.pm b/server/lib/mogdeps/Perlbal/HTTPHeaders.pm
index 2ae4db2..13a8721 100644
--- a/server/lib/mogdeps/Perlbal/HTTPHeaders.pm
+++ b/server/lib/mogdeps/Perlbal/HTTPHeaders.pm
@@ -1,7 +1,7 @@
 ######################################################################
 # HTTP header class (both request and response)
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
@@ -406,7 +406,7 @@ sub res_keep_alive {
 
 # returns (status, range_start, range_end) when given a size
 # status = 200 - invalid or non-existent range header.  serve normally.
-# status = 206 - parsable range is good.  serve partial content.
+# status = 206 - parseable range is good.  serve partial content.
 # status = 416 - Range is unsatisfiable
 sub range {
     my Perlbal::HTTPHeaders $self = $_[0];
diff --git a/server/lib/mogdeps/Perlbal/Plugin/Stats.pm b/server/lib/mogdeps/Perlbal/Plugin/Stats.pm
index 6dd42df..412555b 100644
--- a/server/lib/mogdeps/Perlbal/Plugin/Stats.pm
+++ b/server/lib/mogdeps/Perlbal/Plugin/Stats.pm
@@ -27,7 +27,7 @@ sub register {
     $statobjs{$svc->{name}} = [ $svc, $sobj ];
 
     # simple events we count are done here.  when the hook on the left side is called,
-    # we simply increment the count of the stat ont he right side.
+    # we simply increment the count of the stat on the right side.
     my %simple = qw(
         start_send_file         files_sent
         start_file_reproxy      files_reproxied
diff --git a/server/lib/mogdeps/Perlbal/Plugin/Vhosts.pm b/server/lib/mogdeps/Perlbal/Plugin/Vhosts.pm
index a6d3755..6a14e27 100644
--- a/server/lib/mogdeps/Perlbal/Plugin/Vhosts.pm
+++ b/server/lib/mogdeps/Perlbal/Plugin/Vhosts.pm
@@ -3,9 +3,9 @@
 ###########################################################################
 
 # things to test:
-#   one persistent connection, first to a docs plugin, then to web proxy... see if it returns us to our base class after end of reuqest
+#   one persistent connection, first to a docs plugin, then to web proxy... see if it returns us to our base class after end of request
 #   PUTing a large file to a selector, seeing if it is put correctly to the PUT-enabled web_server proxy
-#   obvious cases:  non-existant domains, default domains (*), proper matching (foo.brad.lj before *.brad.lj)
+#   obvious cases:  non-existent domains, default domains (*), proper matching (foo.brad.lj before *.brad.lj)
 #
 
 package Perlbal::Plugin::Vhosts;
diff --git a/server/lib/mogdeps/Perlbal/Pool.pm b/server/lib/mogdeps/Perlbal/Pool.pm
index 9b1690d..b7893c0 100644
--- a/server/lib/mogdeps/Perlbal/Pool.pm
+++ b/server/lib/mogdeps/Perlbal/Pool.pm
@@ -2,7 +2,7 @@
 # Pool class
 ######################################################################
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
diff --git a/server/lib/mogdeps/Perlbal/ReproxyManager.pm b/server/lib/mogdeps/Perlbal/ReproxyManager.pm
index f80094d..ba10cba 100644
--- a/server/lib/mogdeps/Perlbal/ReproxyManager.pm
+++ b/server/lib/mogdeps/Perlbal/ReproxyManager.pm
@@ -1,6 +1,6 @@
 # HTTP connection to non-pool backend nodes (probably fast event-based webservers)
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
diff --git a/server/lib/mogdeps/Perlbal/Service.pm b/server/lib/mogdeps/Perlbal/Service.pm
index 63a431c..becfb94 100644
--- a/server/lib/mogdeps/Perlbal/Service.pm
+++ b/server/lib/mogdeps/Perlbal/Service.pm
@@ -2,7 +2,7 @@
 # Service class
 ######################################################################
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 #
 
@@ -25,8 +25,8 @@ use fields (
 
             # end-user tunables
             'listen',             # scalar IP:port of where we're listening for new connections
-            'docroot',            # document root for webserver role
-            'dirindexing',        # bool: direcotry indexing?  (for webserver role)  not async.
+            'docroot',            # document root for web server role
+            'dirindexing',        # bool: directory indexing?  (for web server role)  not async.
             'index_files',        # arrayref of filenames to try for index files
             'enable_concatenate_get',   # bool:  if user can request concatenated files
             'enable_put', # bool: whether PUT is supported
@@ -86,8 +86,8 @@ use fields (
             'upload_status_listeners_sockaddr',  # arrayref of sockaddrs (packed ip/port)
 
             'enable_ssl',         # bool: whether this service speaks SSL to the client
-            'ssl_key_file',       # file:  path to key pem file
-            'ssl_cert_file',      # file:  path to key pem file
+            'ssl_key_file',       # file:  path to key PEM file
+            'ssl_cert_file',      # file:  path to key PEM file
             'ssl_cipher_list',    # OpenSSL cipher list string
 
             'enable_error_retries',  # bool: whether we should retry requests after errors
@@ -371,7 +371,7 @@ our $tunables = {
     'index_files' => {
         check_role => "web_server",
         default => "index.html",
-        des => "Comma-seperated list of filenames to load when a user visits a directory URL, listed in order of preference.",
+        des => "Comma-separated list of filenames to load when a user visits a directory URL, listed in order of preference.",
         setter => sub {
             my ($self, $val, $set, $mc) = @_;
             $self->{index_files} = [ split(/[\s,]+/, $val) ];
@@ -1190,7 +1190,7 @@ sub spawn_backends {
         unless ($pool) {
             if (my $sp = $self->{server_process}) {
                 warn "To create = $to_create...\n";
-                warn "  spawing $sp\n";
+                warn "  spawning $sp\n";
                 my $be = Perlbal::BackendHTTP->new_process($self, $sp);
                 return;
             }
diff --git a/server/lib/mogdeps/Perlbal/Socket.pm b/server/lib/mogdeps/Perlbal/Socket.pm
index 698f6bb..edd0a6a 100644
--- a/server/lib/mogdeps/Perlbal/Socket.pm
+++ b/server/lib/mogdeps/Perlbal/Socket.pm
@@ -1,6 +1,6 @@
 # Base class for all socket types
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 
 package Perlbal::Socket;
@@ -106,7 +106,7 @@ sub new {
             @created_objects = grep { $_ } @created_objects;
 
             # however, the grep turned our weak references back into strong ones, so
-            # we have to reweaken them
+            # we have to re-weaken them
             weaken($_) foreach @created_objects;
 
             # we've cleaned up at this point
diff --git a/server/lib/mogdeps/Perlbal/TCPListener.pm b/server/lib/mogdeps/Perlbal/TCPListener.pm
index b64fbce..d5e4377 100644
--- a/server/lib/mogdeps/Perlbal/TCPListener.pm
+++ b/server/lib/mogdeps/Perlbal/TCPListener.pm
@@ -1,7 +1,7 @@
 ######################################################################
 # TCP listener on a given port
 #
-# Copyright 2004, Danga Interactice, Inc.
+# Copyright 2004, Danga Interactive, Inc.
 # Copyright 2005-2006, Six Apart, Ltd.
 
 
diff --git a/server/lib/mogdeps/Sys/Syscall.pm b/server/lib/mogdeps/Sys/Syscall.pm
index 2527258..5222eed 100644
--- a/server/lib/mogdeps/Sys/Syscall.pm
+++ b/server/lib/mogdeps/Sys/Syscall.pm
@@ -81,7 +81,7 @@ if ($^O eq "linux") {
         $SYS_epoll_ctl    = 237;
         $SYS_epoll_wait   = 238;
         $SYS_sendfile     = 186;  # (sys32_sendfile).  sys32_sendfile64=226  (64 bit processes: sys_sendfile64=186)
-        $SYS_readahead    = 191;  # both 32-bit and 64-bit vesions
+        $SYS_readahead    = 191;  # both 32-bit and 64-bit versions
         $u64_mod_8        = 1;
     } elsif ($machine eq "ppc") {
         $SYS_epoll_create = 236;
@@ -285,7 +285,7 @@ Returns true if epoll might be available.  (caller must still test with epoll_cr
 
 =item $epfd = epoll_create([ $start_size ])
 
-Create a new epoll filedescriptor.  Returns -1 if epoll isn't available.
+Create a new epoll file descriptor.  Returns -1 if epoll isn't available.
 
 =item $rv = epoll_ctl($epfd, $op, $fd, $events)
 
diff --git a/server/mogautomount b/server/mogautomount
index 8699272..a9e7dc5 100755
--- a/server/mogautomount
+++ b/server/mogautomount
@@ -112,7 +112,7 @@ to the underlying filesystem.
 
 0 on success or inaction because no action needed to happen.
 
-1 on partial failure (some mounts succeeed).
+1 on partial failure (some mounts succeed).
 
 2 on total failure (things had to be done, but nothing was).
 
diff --git a/server/mogilefsd b/server/mogilefsd
index 6175f4a..5301a29 100755
--- a/server/mogilefsd
+++ b/server/mogilefsd
@@ -102,6 +102,6 @@ Same terms as Perl itself.  Artistic/GPLv2, at your choosing.
 
 =head1 SEE ALSO
 
-L<mogstored> -- MogilefS storage daemon
+L<mogstored> -- MogileFS storage daemon
 
 L<http://danga.com/mogilefs/>
diff --git a/server/mogstored b/server/mogstored
index 749fa2e..1bb0184 100755
--- a/server/mogstored
+++ b/server/mogstored
@@ -168,7 +168,7 @@ sub load_config_file {
     my ($conffile, $opts) = @_;
 
     # parse the mogstored config file, which is just lines of comments and
-    # "key = value" lines, where keys are just the same as commandline
+    # "key = value" lines, where keys are just the same as command line
     # options.
     die "Config file $opt_config doesn't exist.\n" unless -e $conffile;
     open my $fh, $conffile or die "Couldn't open config file for reading: $!";
@@ -213,7 +213,7 @@ sub start_fidsizes_worker {
         $class->exec;
     });
 
-    # old Gearman::Servers didn't return pid integegers
+    # old Gearman::Servers didn't return pid integers
     if ($pid =~ /^\d+$/) {
         Mogstored->on_pid_death($pid, \&start_fidsizes_worker);
     }
diff --git a/server/t/10-weighting.t b/server/t/10-weighting.t
index 41db195..3bee554 100644
--- a/server/t/10-weighting.t
+++ b/server/t/10-weighting.t
@@ -11,7 +11,7 @@ use MogileFS::Server;
 BEGIN {
     $ENV{TESTING} = 1;
     $ENV{T_FAKE_IO_DEV1} = 95; # Simulating high device load (should get fewer requests).
-    $ENV{T_FAKE_IO_DEV2} = 5;  # Simulating low device load (shoudld get more requests).
+    $ENV{T_FAKE_IO_DEV2} = 5;  # Simulating low device load (should get more requests).
 }
 
 use MogileFS::Test;
diff --git a/server/t/20-filepaths.t b/server/t/20-filepaths.t
index 1f36394..5c9b1c6 100644
--- a/server/t/20-filepaths.t
+++ b/server/t/20-filepaths.t
@@ -23,7 +23,7 @@ find_mogclient_or_skip();
 # add file,
 # etc
 
-plan skip_all => "Filepaths plugin has been seperated from the server, a bit of work is needed to make the tests run again.";
+plan skip_all => "Filepaths plugin has been separated from the server, a bit of work is needed to make the tests run again.";
 exit 0;
 
 my $sto = eval { temp_store(); };
diff --git a/server/t/mogstored-shutdown.t b/server/t/mogstored-shutdown.t
index 26a8d94..d9ebb42 100644
--- a/server/t/mogstored-shutdown.t
+++ b/server/t/mogstored-shutdown.t
@@ -65,7 +65,7 @@ ok(!$alive, "gone");
 # dies when not able to find
 sub exist_pid {
     unless (`netstat -nap --inet` =~ m!127\.0\.1\.1:750[10].+LISTEN\s+(\d+)/!) {
-        die "Could't find pid of daemonized process.\n";
+        die "Couldn't find pid of daemonized process.\n";
     }
     return $1;
 }
diff --git a/server/t/multiple-hosts-replpol.t b/server/t/multiple-hosts-replpol.t
index d009388..4aa870e 100644
--- a/server/t/multiple-hosts-replpol.t
+++ b/server/t/multiple-hosts-replpol.t
@@ -20,7 +20,7 @@ is(rr("min=2  h1[d1=X d2=_] h2[d3=X d4=_]"),
 is(rr("min=2  h1[d1=X d2=_] h2[d3=_ d4=_]"),
    "ideal(3,4)", "need host2");
 
-# still needs to be on host2, even though 2 coies on host1
+# still needs to be on host2, even though 2 copies on host1
 is(rr("min=2  h1[d1=X d2=X] h2[d3=_ d4=_]"),
    "ideal(3,4)", "need host2, even though 2 on host1");
 
diff --git a/utils/debian/control b/utils/debian/control
index e17e76f..c16faba 100644
--- a/utils/debian/control
+++ b/utils/debian/control
@@ -8,6 +8,6 @@ Standards-Version: 3.6.1.0
 Package: mogilefs-utils
 Architecture: all
 Depends: ${perl:Depends}, libcompress-zlib-perl, libwww-perl, libmogilefs-perl
-Description: utilities to manipulate mogileFS filesystems
+Description: utilities to manipulate MogileFS filesystems
  The mogilefs-utils package contains tools to administrate and work with the 
- mogileFS filesystem from Danga Interactive.
+ MogileFS filesystem from Danga Interactive.
diff --git a/utils/mogadm b/utils/mogadm
index 12950a5..bdad6ef 100755
--- a/utils/mogadm
+++ b/utils/mogadm
@@ -112,13 +112,13 @@ my $usage = {
                 },
             },
             modify => {
-                des => "Modify a device's propereties.",
+                des => "Modify a device's properties.",
                 args => "<hostname> <devid> [opts]",
                 opts => {
                     "<hostname>" => "Hostname of device",
                     "<devid>"    => "Numeric devid to modify.",
                     "--status=s" => "One of {alive,dead,down,drain,readonly}",
-                    "--weight=i" => "Postive numeric weight for device",
+                    "--weight=i" => "Positive numeric weight for device",
                 },
             },
         },
@@ -157,7 +157,7 @@ my $usage = {
                 opts => {
                     "<domain>" => "Domain to add class to.",
                     "<class>"  => "Name of class to add.",
-                    "--mindevcount=i" => "Mininum number of replicas.",
+                    "--mindevcount=i" => "Minimum number of replicas.",
                 },
             },
             modify => {
@@ -166,7 +166,7 @@ my $usage = {
                 opts => {
                     "<domain>" => "Domain to add class to.",
                     "<class>"  => "Name of class to add.",
-                    "--mindevcount=i" => "Mininum number of replicas.",
+                    "--mindevcount=i" => "Minimum number of replicas.",
                 },
             },
             delete => {
@@ -1447,7 +1447,7 @@ check every fid, you must call B<fsck reset> before calling start.
 
 Show the status of the presently active (or last if none active) fsck. This
 includes what FIDs are being checked, time statistics, check type as well as a
-summary of problems encounted so far.
+summary of problems encountered so far.
 
 =item B<fsck stop>
 
diff --git a/utils/mogtool b/utils/mogtool
index bb3a7c8..67a298e 100755
--- a/utils/mogtool
+++ b/utils/mogtool
@@ -280,7 +280,7 @@ Specifies the key of the file to locate
 
 =item 0
 
-Sucess during operation.
+Success during operation.
 
 =item 1
 
@@ -288,7 +288,7 @@ During the locate, list, or listkey operation, the key was not found.
 
 =item 2
 
-Some fatal error occured.
+Some fatal error occurred.
 
 =back
 
@@ -1169,7 +1169,7 @@ sub extract {
         }
     }
 
-    # several cases.. going to stdout?
+    # several cases.. going to STDOUT?
     if ($dest eq '-') {
         *O = *STDOUT;
     } else {
@@ -1182,7 +1182,7 @@ sub extract {
                 $dest =~ s!^(.+)/!!;
             }
             if (-b $dest) {
-                # if we're targetting a block device...
+                # if we're targeting a block device...
                 warn "FIXME: add in block checking\n";
                 open O, ">$dest"
                     or die "Couldn't open $dest: $!\n";
@@ -1238,7 +1238,7 @@ sub extract {
 
     # now make sure we have enough data
 #$ mogtool [opts] extract <key> {<file>,<dir>,<device>}
-                                 #=>  -  (for stdout)    (if compressed, add "z" flag)
+                                 #=>  -  (for STDOUT)    (if compressed, add "z" flag)
                                  #=>  .   (to untar)     (if compressed, do nothing???, make .tar.gz file -- unless they use -z again?)
                                  #=> /dev/sda4  (but check /proc/partitions that it's big enough)  (if compress, Compress::Zlib to ungzip
 #                                 => foo.jpg  (write it to a file)
@@ -1257,7 +1257,7 @@ sub locate {
     my $dkey = $key;
     $dkey = "_big_info:$key" if $opts{big};
     
-    # list all pathes for the file
+    # list all paths for the file
     my $ct = 0;
     my @paths = [];
     my @paths = grep { defined $_ } $mogfs->get_paths($dkey, $opts{verify} );
@@ -1302,7 +1302,7 @@ sub listkey {
     my $key_pattern = shift(@ARGV);
     abortWithUsage("key pattern required") unless $key_pattern;
 
-    # list all files matchine a key
+    # list all files matching a key
     my ($ct, $after, $list);
     $ct = 0;
     while (($after, $list) = $mogfs->list_keys("$key_pattern", $after)) {
@@ -1416,7 +1416,7 @@ Valid i-opts:
 
 
 $ mogtool [opts] extract <key> {<file>,<dir>,<device>}
-                                  =>  -  (for stdout)    (if compressed, add "z" flag)
+                                  =>  -  (for STDOUT)    (if compressed, add "z" flag)
                                   =>  .   (to untar)     (if compressed, do nothing???, make .tar.gz file -- unless they use -z again?)
                                   => /dev/sda4  (but check /proc/partitions that it's big enough)  (if compress, Compress::Zlib to ungzip)
                                   => foo.jpg  (write it to a file)



More information about the mogilefs mailing list