[css-ruby] Make bikeshed happy

Author: frivoal

css-ruby-1/Overview.bs

@@ -648,10 +648,10 @@ White Space Collapsing</h3>
 	it will collapse across adjacent boxes in each line box
 	following the standard <a href="https://www.w3.org/TR/css3-text/#white-space-rules">white space processing rules</a> [[!CSS-TEXT-3]].
 	Annotations in separate [=ruby segments=]
-	or separated by [=auto-hidden annotations=]
+	or separated by [=hidden annotations=]
 	are not considered adjacent;
 	however all base-level content
-	(including [=inter-character annotation boxes=],
+	(including [=inter-character annotations=],
 	which are treated as [=atomic inlines=])
 	is.
 	For [=collapsible white space=] between [=ruby segments=] ([=inter-segment white space=]),
@@ -694,7 +694,7 @@ Ruby Layout</h2>
 	Each [=base container=] is then sized and positioned
 	to contain exactly all of its [=ruby bases=]’ margin boxes--
 	and all their associated [=inter-character=] [=ruby annotation=] margin boxes, if any--
-	as well as the [=base containers|base=] and [=annotations containers=]
+	as well as the [=base containers|base=] and [=annotation containers=]
 	of any descendant [=ruby containers=]
 	also participating in this [=inline formatting context=].
 	(If a [=base container=] has no [=in-flow=] content,
@@ -713,7 +713,7 @@ Ruby Layout</h2>
 
 	Each [=interlinear=] [=annotation container=] is then sized and positioned
 	to contain exactly all of its [=ruby annotations=]’ margin boxes
-	as well as the [=base containers|base=] and [=annotations containers=]
+	as well as the [=base containers|base=] and [=annotation containers=]
 	of any descendant [=ruby containers=]
 	also participating in this [=annotation level=]’s [=inline formatting context=].
 	(If an [=annotation container=] has no [=in-flow=] content,
@@ -1179,7 +1179,7 @@ Sharing Annotation Space: the 'ruby-merge' property</h3>
 	This property controls how ruby annotation boxes should be rendered
 	when there are more than one in a ruby container box:
 	whether each pair should be kept separate,
-	the annotations should be <dfn lt="merged annotation">merged</dfn> and rendered as a group,
+	the annotations should be <dfn lt="merged annotation | merged">merged</dfn> and rendered as a group,
 	or the separation should be determined based on the space available.
 
 	Note: [=Inter-character annotations=] are always separate, and this property does not apply.