Fix <'font'> syntax, simplify <font-variant-css2> and <font-width-css3> syntaxes

Author: lahmatiy

css-fonts-4/Overview.bs

@@ -1705,7 +1705,7 @@ Shorthand font property: the 'font' property</h3>
 		<<font-variant-css2>> ||
 		<<'font-weight'>> ||
 		<<font-width-css3>> ]? <<'font-size'>> [ / <<'line-height'>> ]?
-		<<'font-family'>> ] |
+		<<'font-family'>># ] |
 		<<system-family-name>>
 	Initial: see individual properties
 	Applies to: all elements and text
@@ -1750,17 +1750,17 @@ Shorthand font property: the 'font' property</h3>
 	'font!!property' shorthand:
 
 	<pre class="prod"><dfn id="font-variant-css21-values"><<font-variant-css2>></dfn>
-		= [normal | small-caps]</pre>
+		= normal | small-caps</pre>
 
 	Values for the 'font-width!!property' property can also be included
 	but only those supported in CSS Fonts level 3,
 	none of the 'font-width!!property' values added in this specification
 	can be used in the 'font' shorthand:
 
 	<pre class="prod"><dfn id="font-width-css3-values"><<font-width-css3>></dfn>
-		= [normal | ultra-condensed | extra-condensed | condensed |
+		= normal | ultra-condensed | extra-condensed | condensed |
 		  semi-condensed | semi-expanded | expanded | extra-expanded |
-		  ultra-expanded]</pre>
+		  ultra-expanded</pre>
 
 	Therefore we have the following classification
 	of font-related properties