Index: usr.sbin/autofs/auto_master.5
===================================================================
--- usr.sbin/autofs/auto_master.5
+++ usr.sbin/autofs/auto_master.5
@@ -124,6 +124,11 @@
 .Xr automountd 8
 to find the right map entry to use.
 It is also used to form the final mountpoint.
+Key can be a wildcard (
+.Ql *
+); it will match every directory that doesn't match other keys.
+Those directories will not be visible to the user
+until accessed.
 .Pp
 The
 .Ar options
@@ -155,6 +160,16 @@
 The
 .Ar location
 field specifies the filesystem to be mounted.
+If the
+.Ar location
+field contains an ampersand (
+.Ql &
+), it will be replaced with key.
+This is typically used with wildcards, like this:
+.Bd -literal -offset indent
+.Li *	192.168.1.1:/share/&
+.Ed
+.Pp
 To pass location that begins with
 .Li / ,
 prefix it with colon.