diff --git a/collects/config/config.ss b/collects/config/config.ss
index abdada422b..7494e53e88 100644
--- a/collects/config/config.ss
+++ b/collects/config/config.ss
@@ -1,6 +1,6 @@
 
 ;; The config module doesn't have to use "configtab.ss";
-;; it just has the have the right exports. But using
+;; it just has to have the right exports. But using
 ;; "configtab.ss" makes it easier to generate the
 ;; code at install time.
 (module config (lib "configtab.ss" "setup")
diff --git a/collects/setup/doc.txt b/collects/setup/doc.txt
index 75308b7fbd..532b4978fe 100644
--- a/collects/setup/doc.txt
+++ b/collects/setup/doc.txt
@@ -277,10 +277,10 @@ _Finding installation directories_
 The _dirs.ss_ modules defines several procedures for locating
 installation directories:
 
-> (find-main-collects-dir)
+> (find-collects-dir)
 
   Returns a path to the installation's main "collects" directory, or
-  #f if none can be found. (A #f result is likely only in an
+  #f if none can be found. (A #f result is likely only in a
   stand-alone executable that is distributed without libraries.)
 
 > (find-user-collects-dir)
@@ -288,7 +288,7 @@ installation directories:
   Returns a path to the user-specific "collects" directory; the
   directory indicated by the returned path may or may not exist.
 
-> (get-collects-search-dir)
+> (get-collects-search-dirs)
 
   Returns the same result as `(current-library-collection-paths)'.
 
@@ -303,7 +303,7 @@ installation directories:
   Returns a path to a user-specific "doc" directory; the directory
   indicated by the returned path may or may not exist.
 
-> (get-doc-search-dir)
+> (get-doc-search-dirs)
 
   Returns a list of paths to search for documentation, not including
   documentation stored in individual collections. Unless it is
@@ -329,7 +329,7 @@ installation directories:
   Returns a path to a user-specific "lib" directory; the directory
   indicated by the returned path may or may not exist.
 
-> (get-lib-search-dir)
+> (get-lib-search-dirs)
 
   Returns a list of paths to search for libraries. Unless it is
   configured otherwise, the result includes any non-#f result of
@@ -347,7 +347,7 @@ installation directories:
   Returns a path to a user-specific "include" directory; the directory
   indicated by the returned path may or may not exist.
 
-> (get-include-search-dir)
+> (get-include-search-dirs)
 
   Returns a list of paths to search for .h files. Unless it is
   configured otherwise, the result includes any non-#f result of