3 files changed, 24 insertions, 24 deletions
diff --git a/src/mailman/commands/docs/control.txt b/src/mailman/commands/docs/control.rst
index 78a15b7b2..70b870668 100644
--- a/src/mailman/commands/docs/control.txt
+++ b/src/mailman/commands/docs/control.rst
@@ -10,38 +10,38 @@ Set up
 ======
 
 All we care about is the master process; normally it starts a bunch of
-qrunners, but we don't care about any of them, so write a test configuration
-file for the master that disables all the qrunners.
+runners, but we don't care about any of them, so write a test configuration
+file for the master that disables all the runners.
 
     >>> import shutil
     >>> from os.path import dirname, join
-    >>> config_file = join(dirname(config.filename), 'no-qrunners.cfg')
+    >>> config_file = join(dirname(config.filename), 'no-runners.cfg')
     >>> shutil.copyfile(config.filename, config_file)
     >>> with open(config_file, 'a') as fp:
     ...     print >> fp, """\
-    ... [qrunner.archive]
+    ... [runner.archive]
     ... start: no
-    ... [qrunner.bounces]
+    ... [runner.bounces]
     ... start: no
-    ... [qrunner.command]
+    ... [runner.command]
     ... start: no
-    ... [qrunner.in]
+    ... [runner.in]
     ... start: no
-    ... [qrunner.lmtp]
+    ... [runner.lmtp]
     ... start: no
-    ... [qrunner.news]
+    ... [runner.news]
     ... start: no
-    ... [qrunner.out]
+    ... [runner.out]
     ... start: no
-    ... [qrunner.pipeline]
+    ... [runner.pipeline]
     ... start: no
-    ... [qrunner.rest]
+    ... [runner.rest]
     ... start: no
-    ... [qrunner.retry]
+    ... [runner.retry]
     ... start: no
-    ... [qrunner.virgin]
+    ... [runner.virgin]
     ... start: no
-    ... [qrunner.digest]
+    ... [runner.digest]
     ... start: no
     ... """
 
@@ -59,11 +59,11 @@ Starting
     ...     config = config_file
     >>> args = FakeArgs()
 
-Starting the daemons prints a useful message and starts the master qrunner
-watcher process in the background.
+Starting the daemons prints a useful message and starts the master watcher
+process in the background.
 
     >>> start.process(args)
-    Starting Mailman's master queue runner
+    Starting Mailman's master runner
 
     >>> import errno, os, time
     >>> from datetime import timedelta, datetime
@@ -104,7 +104,7 @@ stops all the child processes too.
     >>> from mailman.commands.cli_control import Stop
     >>> stop = Stop()
     >>> stop.process(args)
-    Shutting down Mailman's master queue runner
+    Shutting down Mailman's master runner
 
     >>> def bury_master():
     ...     until = timedelta(seconds=10) + datetime.now()
diff --git a/src/mailman/commands/docs/info.txt b/src/mailman/commands/docs/info.txt
index 9658e93e6..83b3fe179 100644
--- a/src/mailman/commands/docs/info.txt
+++ b/src/mailman/commands/docs/info.txt
@@ -65,10 +65,10 @@ The File System Hierarchy layout is the same every by definition.
         EXT_DIR                  = /etc/mailman.d
         LIST_DATA_DIR            = /var/lib/mailman/lists
         LOCK_DIR                 = /var/lock/mailman
-        LOCK_FILE                = /var/lock/mailman/master-qrunner.lck
+        LOCK_FILE                = /var/lock/mailman/master.lck
         LOG_DIR                  = /var/log/mailman
         MESSAGES_DIR             = /var/lib/mailman/messages
-        PID_FILE                 = /var/run/mailman/master-qrunner.pid
+        PID_FILE                 = /var/run/mailman/master.pid
         PRIVATE_ARCHIVE_FILE_DIR = /var/lib/mailman/archives/private
         PUBLIC_ARCHIVE_FILE_DIR  = /var/lib/mailman/archives/public
         QUEUE_DIR                = /var/spool/mailman
diff --git a/src/mailman/commands/docs/status.txt b/src/mailman/commands/docs/status.txt
index 6deb7fdc0..7587157bc 100644
--- a/src/mailman/commands/docs/status.txt
+++ b/src/mailman/commands/docs/status.txt
@@ -18,18 +18,18 @@ The status is printed to stdout and a status code is returned.
     GNU Mailman is not running
     0
 
-We can simulate the master queue runner starting up by acquiring its lock.
+We can simulate the master starting up by acquiring its lock.
 
     >>> from flufl.lock import Lock
     >>> lock = Lock(config.LOCK_FILE)
     >>> lock.lock()
 
-Getting the status confirms that the master queue runner is running.
+Getting the status confirms that the master is running.
 
     >>> status.process(FakeArgs)
     GNU Mailman is running (master pid: ...
 
-We shutdown the master queue runner, and confirm the status.
+We shut down the master and confirm the status.
 
     >>> lock.unlock()
     >>> status.process(FakeArgs)