3 files changed, 19 insertions, 4 deletions
diff --git a/man.7 b/man.7
index 6fdcf803..b91bd6c7 100644
--- a/man.7
+++ b/man.7
@@ -216,8 +216,13 @@ literal text.
 When composing a manual, make sure that your sentences end at the end of
 a line.
 By doing so, front-ends will be able to apply the proper amount of
-spacing after the end of sentence (unescaped) period, exclamation, or question
-mark.
+spacing after the end of sentence (unescaped) period, exclamation mark,
+or question mark followed by zero or more non-sentence closing
+delimiters (
+.Ns Sq \&) ,
+.Sq \&] ,
+.Sq \&' ,
+.Sq \&" ) .
 .Sh MANUAL STRUCTURE
 Each
 .Nm
diff --git a/mandoc.c b/mandoc.c
index 5ed306c6..43ccfb21 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -320,6 +320,8 @@ mandoc_eos(const char *p, size_t sz)
 			/* FALLTHROUGH */
 		case ('\''):
 			/* FALLTHROUGH */
+		case (']'):
+			/* FALLTHROUGH */
 		case (')'):
 			break;
 		case ('.'):
diff --git a/mdoc.7 b/mdoc.7
index 82472a3a..70fccf82 100644
--- a/mdoc.7
+++ b/mdoc.7
@@ -301,10 +301,18 @@ When composing a manual, make sure that your sentences end at the end of
 a line.
 By doing so, front-ends will be able to apply the proper amount of
 spacing after the end of sentence (unescaped) period, exclamation mark,
-or question mark.
+or question mark followed by zero or more non-sentence closing
+delimiters (
+.Ns Sq \&) ,
+.Sq \&] ,
+.Sq \&' ,
+.Sq \&" ) .
 .Pp
 The proper spacing is also intelligently preserved if a sentence ends at
-the boundary of a macro line.
+the boundary of a macro line, e.g.,
+.Pp
+.D1 \&Xr mandoc 1 \.
+.D1 \&Fl T \&Ns \&Cm ascii \.
 .Sh MANUAL STRUCTURE
 A well-formed
 .Nm