diff --git a/doc/.gitignore b/doc/.gitignore
index 44d9deb27..8189eeacd 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -1,6 +1,12 @@
+# Guidebook without a suffix is usually a copy of Guidebook.txt.  The
+# latter is managed by git because it is part of the source distribution.
+# We don't want both copies.
 Guidebook
+# various intermediate files or generated output, not to be tracked.
 Guidebook.aux
+Guidebook.dvi
 Guidebook.log
 Guidebook.pdf
-Guidebook.synctex.gz
+Guidebook.ps
+*.synctex.*
 
diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index db16a8423..e82f2f97d 100644
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -1,4 +1,4 @@
-.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.286 $ $NHDT-Date: 1540625949 2018/10/27 07:39:09 $
+.\" $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.292 $ $NHDT-Date: 1546984605 2019/01/08 21:56:45 $
 .\"
 .\" This is an excerpt from the 'roff' man page from the 'groff' package.
 .\" NetHack's Guidebook.mn currently does *not* adhere to these guidelines.
@@ -587,6 +587,8 @@ or (for \(lq#loot\(rq to remove a saddle),
 skip containers and go straight to adjacent monsters.
 The prefix will
 make \(lq#travel\(rq command show a menu of interesting targets in sight.
+In debug mode (aka \(lqwizard mode\(rq), the \(oqm\(cq prefix may also be
+used with the \(lq#teleport\(rq and \(lq#wizlevelport\(rq commands.
 .lp F[yuhjklbn]
 Prefix:  fight a monster (even if you only guess one is there).
 .lp M[yuhjklbn]
diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index 57be65355..b14ec4072 100644
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -702,6 +702,8 @@ and go straight to checking inventory,
 or (for ``{\tt \#loot}'' to remove a saddle),
 skip containers and go straight to adjacent monsters. The prefix will
 make ``{\tt \#travel}'' command show a menu of interesting targets in sight.
+In debug mode (aka ``wizard mode''), the `{\tt m}' prefix may also be
+used with the ``{\tt \#teleport}'' and ``{\tt \#wizlevelport}'' commands.
 %.lp
 \item[\tb{F[yuhjklbn]}]
 Prefix:  fight a monster (even if you only guess one is there).
diff --git a/src/do_name.c b/src/do_name.c
index dfd96e435..23e8ba6f2 100644
--- a/src/do_name.c
+++ b/src/do_name.c
@@ -1,4 +1,4 @@
-/* NetHack 3.6	do_name.c	$NHDT-Date: 1543185069 2018/11/25 22:31:09 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.136 $ */
+/* NetHack 3.6	do_name.c	$NHDT-Date: 1546987367 2019/01/08 22:42:47 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.140 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Pasi Kallinen, 2018. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -605,10 +605,10 @@ int gloc;
         }
     }
 
-    Sprintf(tmpbuf, "Pick a target %s%s%s",
-            gloc_descr[gloc][1],
+    Sprintf(tmpbuf, "Pick %s%s%s",
+            an(gloc_descr[gloc][1]),
             gloc_filtertxt[iflags.getloc_filter],
-            iflags.getloc_travelmode ? " for travel" : "");
+            iflags.getloc_travelmode ? " for travel destination" : "");
     end_menu(tmpwin, tmpbuf);
     pick_cnt = select_menu(tmpwin, PICK_ONE, &picks);
     destroy_nhwindow(tmpwin);
@@ -628,7 +628,7 @@ boolean force;
 const char *goal;
 {
     const char *cp;
-    struct {
+    static struct {
         int nhkf, ret;
     } const pick_chars_def[] = {
         { NHKF_GETPOS_PICK, LOOK_TRADITIONAL },
@@ -636,7 +636,7 @@ const char *goal;
         { NHKF_GETPOS_PICK_O, LOOK_ONCE },
         { NHKF_GETPOS_PICK_V, LOOK_VERBOSE }
     };
-    const int mMoOdDxX_def[] = {
+    static const int mMoOdDxX_def[] = {
         NHKF_GETPOS_MON_NEXT,
         NHKF_GETPOS_MON_PREV,
         NHKF_GETPOS_OBJ_NEXT,
@@ -807,8 +807,8 @@ const char *goal;
         } else if (c == g.Cmd.spkeys[NHKF_GETPOS_LIMITVIEW]) {
             static const char *const view_filters[NUM_GFILTER] = {
                 "Not limiting targets",
-                "Limiting targets to in sight",
-                "Limiting targets to in same area"
+                "Limiting targets to those in sight",
+                "Limiting targets to those in same area"
             };
 
             iflags.getloc_filter = (iflags.getloc_filter + 1) % NUM_GFILTER;
@@ -824,8 +824,10 @@ const char *goal;
             goto nxtc;
         } else if (c == g.Cmd.spkeys[NHKF_GETPOS_MENU]) {
             iflags.getloc_usemenu = !iflags.getloc_usemenu;
-            pline("%s a menu to show possible targets.",
-                  iflags.getloc_usemenu ? "Using" : "Not using");
+            pline("%s a menu to show possible targets%s.",
+                  iflags.getloc_usemenu ? "Using" : "Not using",
+                  iflags.getloc_usemenu
+                      ? " for 'm|M', 'o|O', 'd|D', and 'x|X'" : "");
             msg_given = TRUE;
             goto nxtc;
         } else if (c == g.Cmd.spkeys[NHKF_GETPOS_SELF]) {