diff --git a/doc/fibers.qbk b/doc/fibers.qbk
index 033500d6..748ac8b3 100644
--- a/doc/fibers.qbk
+++ b/doc/fibers.qbk
@@ -33,69 +33,75 @@
 [def __not_a_fiber__ ['not-a-fiber]]
 [def __rendezvous__ ['rendezvous]]
 
-[template mdash[] '''—''']
-[template "[text] '''“'''[text]'''”''']
-[template superscript[exp] '''<superscript>'''[exp]'''</superscript>''']
+[/ important especially for [,] to avoid a space between empty argument
+   brackets and expansion: the space, if any, becomes part of the expansion!]
+[template mdash[]'''&mdash;''']
+[template ,[]'''&#8217;''']
+[template "[text]'''&#8220;'''[text]'''&#8221;''']
+[template superscript[exp]'''<superscript>'''[exp]'''</superscript>''']
+[/ "isn[t]" is slightly more readable than "isn[,]t", and so forth]
+[template s[][,]s]
+[template t[][,]t]
 
 [template class_heading[class_name]
 [hding class_[class_name]..Class [`[class_name]]]
 ]
-[template class_link[class_name] [dblink class_[class_name]..[`[class_name]]]]
+[template class_link[class_name][dblink class_[class_name]..[`[class_name]]]]
 
 [template template_heading[class_name]
 [hding class_[class_name]..Template [`[class_name]<>]]
 ]
-[template template_link[class_name] [dblink class_[class_name]..[`[class_name]<>]]]
+[template template_link[class_name][dblink class_[class_name]..[`[class_name]<>]]]
 
 [template member_heading[class_name method_name]
 [operator_heading [class_name]..[method_name]..[method_name]]
 ]
-[template member_link[class_name method_name] [operator_link [class_name]..[method_name]..[method_name]]]
+[template member_link[class_name method_name][operator_link [class_name]..[method_name]..[method_name]]]
 
 [template operator_heading[class_name method_name method_text]
 [hding [class_name]_[method_name]..Member function [`[method_text]]()]
 ]
-[template operator_link[class_name method_name method_text] [dblink [class_name]_[method_name]..[`[class_name]::[method_text]()]]]
+[template operator_link[class_name method_name method_text][dblink [class_name]_[method_name]..[`[class_name]::[method_text]()]]]
 
 [template template_member_heading[class_name method_name]
 [hding [class_name]_[method_name]..Templated member function [`[method_name]]()]
 ]
-[template template_member_link[class_name method_name] [member_link [class_name]..[method_name]]]
+[template template_member_link[class_name method_name][member_link [class_name]..[method_name]]]
 
 [template static_member_heading[class_name method_name]
 [hding [class_name]_[method_name]..Static member function [`[method_name]]()]
 ]
-[template static_member_link[class_name method_name] [member_link [class_name]..[method_name]]]
+[template static_member_link[class_name method_name][member_link [class_name]..[method_name]]]
 
 [template data_member_heading[class_name member_name]
 [hding [class_name]_[member_name]..Data member [`[member_name]]]
 ]
-[template data_member_link[class_name member_name] [dblink [class_name]_[member_name]..[`[class_name]::[member_name]]]]
+[template data_member_link[class_name member_name][dblink [class_name]_[member_name]..[`[class_name]::[member_name]]]]
 
 [template function_heading[function_name]
 [hding [function_name]..Non-member function [`[function_name]()]]
 ]
-[template function_link[function_name] [dblink [function_name]..[`[function_name]()]]]
+[template function_link[function_name][dblink [function_name]..[`[function_name]()]]]
 
 [template function_heading_for[function_name arg]
 [hding [function_name]\_for\_[arg]..Non-member function [`[function_name]()]]
 ]
-[template function_link_for[function_name arg] [dblink [function_name]\_for\_[arg]..[`[function_name]()]]]
+[template function_link_for[function_name arg][dblink [function_name]\_for\_[arg]..[`[function_name]()]]]
 
 [template ns_function_heading[namespace function_name]
 [hding [namespace]_[function_name]..Non-member function [`[namespace]::[function_name]()]]
 ]
-[template ns_function_link[namespace function_name] [dblink [namespace]_[function_name]..[`[namespace]::[function_name]()]]]
+[template ns_function_link[namespace function_name][dblink [namespace]_[function_name]..[`[namespace]::[function_name]()]]]
 
-[template anchor[name] '''<anchor id="'''[name]'''"/>''']
+[template anchor[name]'''<anchor id="'''[name]'''"/>''']
 [template hding[name title]
 '''<bridgehead renderas="sect4" id="'''[name]_bridgehead'''">
   <phrase id="'''[name]'''"/>
   <link linkend="'''[name]'''">'''[title]'''</link>
 </bridgehead>'''
 ]
-[template dblink[id text] '''<link linkend="'''[id]'''">'''[text]'''</link>''']
-[template `[text] '''<code>'''[text]'''</code>''']
+[template dblink[id text]'''<link linkend="'''[id]'''">'''[text]'''</link>''']
+[template `[text]'''<code>'''[text]'''</code>''']
 
 [def __allocator_arg_t__ [@http://en.cppreference.com/w/cpp/memory/allocator_arg_t `std::allocator_arg_t`]]
 [def __Allocator__ [@http://en.cppreference.com/w/cpp/concept/Allocator `Allocator`]]