diff --git a/doc/bookmarkctl.1 b/doc/bookmarkctl.1
index 342526f..42ce45a 100644
--- a/doc/bookmarkctl.1
+++ b/doc/bookmarkctl.1
@@ -8,18 +8,22 @@ bookmarkctl - manage a mounted BookmarkFS filesystem
 .I subcmd
 .RI [ args ]
 .PP
-.B "bookmarkctl permd"
+.B bookmarkctl
+.B permd
 .RI [ options ]
 .I name1
 .I name2
 .I pathname
 .PP
-.B "bookmarkctl fsck"
+.B bookmarkctl
+.B fsck
 .I pathname
 .PP
-.B "bookmarkctl help"
+.B bookmarkctl
+.B help
 .PP
-.B "bookmarkctl version"
+.B bookmarkctl
+.B version
 .
 .SH DESCRIPTION
 The
@@ -117,4 +121,6 @@ or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 .PP
 You should have received a copy of the license along with this document.
-If not, see <https://www.gnu.org/licenses/fdl-1.3.html>.
+If not, see
+.UR https://www.gnu.org/licenses/fdl-1.3.html
+.UE .
diff --git a/doc/bookmarkfs.texi b/doc/bookmarkfs.texi
index 281db18..d3afa4d 100644
--- a/doc/bookmarkfs.texi
+++ b/doc/bookmarkfs.texi
@@ -238,7 +238,7 @@ This option can be provided multiple times.
 
 @item -o accmode=@var{mode}
 File access mode.
-Defaults to @t{0700}.
+Defaults to @samp{0700}.
 
 This option applies to both directories and regular files.
 Execution bits on regular files are masked off.
@@ -285,7 +285,7 @@ a trailing newline is automatically removed (if one exists).
 
 @item -o file_max=@var{bytes}
 Max file size limit.
-Defaults to @t{32768}.
+Defaults to @samp{32768}.
 
 This limit also applies to extended attribute values.
 
@@ -3788,7 +3788,8 @@ typedef unsigned long (hashmap_hash_func) (
 );
 @end example
 
-This function is only called during rehashing and @code{hashmap_entry_delete}.
+This function is only called during rehashing,
+and during @code{hashmap_delete} with a negative @code{entry_id}.
 @end table
 
 Returns an opaque pointer referring to the new hash table.
diff --git a/doc/fsck.bookmarkfs.1 b/doc/fsck.bookmarkfs.1
index 7b9c0c5..05ee3c6 100644
--- a/doc/fsck.bookmarkfs.1
+++ b/doc/fsck.bookmarkfs.1
@@ -69,7 +69,7 @@ is empty, a built-in handler will be used.
 A handler-specific option.
 This option can be provided multiple times.
 .TP
-.B "\-o repair"
+.B \-o repair
 Attempt to repair errors found during fsck.
 .TP
 \fB\-o rl_app=\fIname\fR
@@ -90,10 +90,10 @@ Perform fsck on subdirectories recursively.
 .IP
 This option is ignored when performing fsck on tags or keywords.
 .TP
-.B "\-o no_sandbox"
+.B \-o no_sandbox
 Do not enable sandboxing features.
 .TP
-.B "\-o no_landlock"
+.B \-o no_landlock
 Do not use
 .BR landlock (7)
 for sandboxing.
@@ -158,4 +158,6 @@ or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 .PP
 You should have received a copy of the license along with this document.
-If not, see <https://www.gnu.org/licenses/fdl-1.3.html>.
+If not, see
+.UR https://www.gnu.org/licenses/fdl-1.3.html
+.UE .
diff --git a/doc/mkfs.bookmarkfs.1 b/doc/mkfs.bookmarkfs.1
index c50c24a..09c9e36 100644
--- a/doc/mkfs.bookmarkfs.1
+++ b/doc/mkfs.bookmarkfs.1
@@ -24,7 +24,7 @@ This option is mandatory.
 A backend-specific option.
 This option can be provided multiple times.
 .TP
-.B "\-o force"
+.B \-o force
 Overwrite existing files when creating the filesystem.
 .TP
 .B \-h
@@ -68,4 +68,6 @@ or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 .PP
 You should have received a copy of the license along with this document.
-If not, see <https://www.gnu.org/licenses/fdl-1.3.html>.
+If not, see
+.UR https://www.gnu.org/licenses/fdl-1.3.html
+.UE .
diff --git a/doc/mount.bookmarkfs.1 b/doc/mount.bookmarkfs.1
index 3d0cf5c..520580a 100644
--- a/doc/mount.bookmarkfs.1
+++ b/doc/mount.bookmarkfs.1
@@ -44,22 +44,22 @@ Defaults to 0700.
 This option applies to both directories and regular files.
 Execution bits on regular files are masked off.
 .TP
-.B "\-o ctime"
+.B \-o ctime
 Maintain last status change time instead of last modification time.
 .IP
 See the full user manual for the rationale behind this option.
 .TP
-.B "\-o eol"
+.B \-o eol
 Add a newline (ASCII LF character) to the end of each file.
 .TP
 \fB\-o file_max=\fIbytes\fR
 Max file size limit.
 Defaults to 32768.
 .TP
-.B "\-o no_sandbox"
+.B \-o no_sandbox
 Do not enable sandboxing features.
 .TP
-.B "\-o no_landlock"
+.B \-o no_landlock
 Do not use
 .BR landlock (7)
 for sandboxing.
@@ -139,4 +139,6 @@ or any later version published by the Free Software Foundation;
 with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
 .PP
 You should have received a copy of the license along with this document.
-If not, see <https://www.gnu.org/licenses/fdl-1.3.html>.
+If not, see
+.UR https://www.gnu.org/licenses/fdl-1.3.html
+.UE .