Remove non-registry functions and options from examples (#625)

* Remove non-registry functions and options from examples

Fixes #569 

Going through our specs to remove or repair examples so that they match the functions in the default registry.

Some generic examples are retained, e.g. `:func` in errors.md where we want to focus the example on syntax rather than the registry.

--
Errors.md:

- fix `:number` options to be spelled out correctly
- fix formatting error examples to use real functions

* Update syntax.md

* Update errors.md

* Fix unnecessarily quoted simple messages

* Update syntax.md

* Update errors.md

* Update syntax.md

* Update formatting.md

* Revert formatting errors example

Author: aphillips

spec/errors.md

@@ -136,19 +136,19 @@ so explicitly declaring it after such use is also an error.
 > Examples of invalid messages resulting in a _Duplicate Declaration_ error:
 >
 > ```
-> .input {$var :number maxFractionDigits=0}
-> .input {$var :number minFractionDigits=0}
+> .input {$var :number maximumFractionDigits=0}
+> .input {$var :number minimumFractionDigits=0}
 > {{Redeclaration of the same variable}}
 >
-> .local $var = {$ext :number maxFractionDigits=0}
-> .input {$var :number minFractionDigits=0}
+> .local $var = {$ext :number maximumFractionDigits=0}
+> .input {$var :number minimumFractionDigits=0}
 > {{Redeclaration of a local variable}}
 >
-> .input {$var :number minFractionDigits=0}
-> .local $var = {$ext :number maxFractionDigits=0}
+> .input {$var :number minimumFractionDigits=0}
+> .local $var = {$ext :number maximumFractionDigits=0}
 > {{Redeclaration of an input variable}}
 >
-> .input {$var :number minFractionDigits=$var2}
+> .input {$var :number minimumFractionDigits=$var2}
 > .input {$var2 :number}
 > {{Redeclaration of the implicit input variable $var2}}
 >
@@ -284,16 +284,16 @@ An **_<dfn>Unsupported Statement</dfn>_** error occurs when a message includes a
 
 > For example, attempting to format either of the following messages
 > might result in a _Selection Error_ if done within a context that
-> uses a `:plural` selector function which requires its input to be numeric:
+> uses a `:number` selector function which requires its input to be numeric:
 >
 > ```
-> .match {|horse| :plural}
+> .match {|horse| :number}
 > 1 {{The value is one.}}
 > * {{The value is not one.}}
 > ```
 >
 > ```
-> .local $sel = {|horse| :plural}
+> .local $sel = {|horse| :number}
 > .match {$sel}
 > 1 {{The value is one.}}
 > * {{The value is not one.}}
@@ -331,3 +331,4 @@ or an internally inconsistent set of options.
 > ```
 > Your {$field} is {$id :get field=$field}
 > ```
+

spec/formatting.md

@@ -591,8 +591,8 @@ foo bar {{Foo and bar}}
 
 A more-complex example is the matching found in selection APIs
 such as ICU's `PluralFormat`.
-Suppose that this API is represented here by the function `:plural`.
-This `:plural` function can match a given numeric value to a specific number _literal_
+Suppose that this API is represented here by the function `:number`.
+This `:number` function can match a given numeric value to a specific number _literal_
 and **_also_** to a plural category (`zero`, `one`, `two`, `few`, `many`, `other`)
 according to locale rules defined in CLDR.
 
@@ -601,7 +601,7 @@ and an `en` (English) locale,
 the pattern selection proceeds as follows for this message:
 
 ```
-.match {$count :plural}
+.match {$count :number}
 one {{Category match}}
 1   {{Exact match}}
 *   {{Other match}}

spec/syntax.md

@@ -190,10 +190,10 @@ external input value does not appear in a previous _declaration_.
 > than one applied to the same _variable_ named in a _declaration_.
 > For example, this message is _valid_:
 > ```
-> .input {$var :number maxFractionDigits=0}
-> .match {$var :plural maxFractionDigits=2}
+> .input {$var :number maximumFractionDigits=0}
+> .match {$var :number maximumFractionDigits=2}
 > 0 {{The selector can apply a different annotation to {$var} for the purposes of selection}}
-> * {{A placeholder in a pattern can apply a different annotation to {$var :number maxFractionDigits=3}}}
+> * {{A placeholder in a pattern can apply a different annotation to {$var :number maximumFractionDigits=3}}}
 > ```
 > (See the [Errors](./errors.md) section for examples of invalid messages)
 
@@ -356,8 +356,8 @@ match-statement = match 1*([s] selector)
 >
 > ```
 > .match {$count :number}
-> 1 {{You have one notification.}}
-> * {{You have {$count} notifications.}}
+> one {{You have {$count} notification.}}
+> *   {{You have {$count} notifications.}}
 > ```
 
 > A _message_ containing a _matcher_ formatted on a single line:
@@ -380,8 +380,9 @@ selector = expression
 There MUST be at least one _selector_ in a _matcher_.
 There MAY be any number of additional _selectors_.
 
-> A _message_ with a single _selector_ that uses a custom `:hasCase` _function_,
-> allowing the _message_ to choose a _pattern_ based on grammatical case:
+> A _message_ with a single _selector_ that uses a custom _function_
+> `:hasCase` which is a _selector_ that allows the _message_ to choose a _pattern_
+> based on grammatical case:
 >
 > ```
 > .match {$userName :hasCase}
@@ -393,13 +394,16 @@ There MAY be any number of additional _selectors_.
 > A message with two _selectors_:
 >
 > ```
-> .match {$photoCount :number} {$userGender :equals}
-> 1 masculine {{{$userName} added a new photo to his album.}}
-> 1 feminine  {{{$userName} added a new photo to her album.}}
-> 1 *         {{{$userName} added a new photo to their album.}}
-> * masculine {{{$userName} added {$photoCount} photos to his album.}}
-> * feminine  {{{$userName} added {$photoCount} photos to her album.}}
-> * *         {{{$userName} added {$photoCount} photos to their album.}}
+> .match {$numLikes :number} {$numShares :number}
+> 0   0   {{Your item has no likes and has not been shared.}}
+> 0   one {{Your item has no likes and has been shared {$numShares} time.}}
+> 0   *   {{Your item has no likes and has been shared {$numShares} times.}}
+> one 0   {{Your item has {$numLikes} like and has not been shared.}}
+> one one {{Your item has {$numLikes} like and has been shared {$numShares} time.}}
+> one *   {{Your item has {$numLikes} like and has been shared {$numShares} times.}}
+> *   0   {{Your item has {$numLikes} likes and has not been shared.}}
+> *   one {{Your item has {$numLikes} likes and has been shared {$numShares} time.}}
+> *   *   {{Your item has {$numLikes} likes and has been shared {$numShares} times.}}
 > ```
 
 ### Variant
@@ -531,7 +535,7 @@ function = ":" identifier *(s option)
 > A _message_ with a _function_ operating on the _variable_ `$now`:
 >
 > ```
-> It is now {$now :datetime}
+> It is now {$now :datetime}.
 > ```
 
 ##### Options
@@ -556,34 +560,18 @@ option = identifier [s] "=" [s] (literal / variable)
 
 > Examples of _functions_ with _options_
 >
-> A _message_ with a `$date` _variable_ formatted with the `:datetime` _function_:
+> A _message_ using the `:datetime` function.
+> The _option_ `weekday` has the literal `long` as its value:
 >
 > ```
-> Today is {$date :datetime weekday=long}.
+> Today is {$date :datetime weekday=long}!
 > ```
 
-> A _message_ with a `$userName` _variable_ formatted with
-> the custom `:person` _function_ capable of
-> declension (using either a fixed dictionary, algorithmic declension, ML, etc.):
+> A _message_ using the `:datetime` function.
+> The _option_ `weekday` has a variable `$dateStyle` as its value:
 >
 > ```
-> Hello, {$userName :person case=vocative}!
-> ```
-
-> A _message_ with a `$userObj` _variable_ formatted with
-> the custom `:person` _function_ capable of
-> plucking the first name from the object representing a person:
->
-> ```
-> Hello, {$userObj :person firstName=long}!
-> ```
-
-> A _message_ formatted with the custom _function_ `:list`
-> that has an option `maxEntries`
-> that has a _variable_ as its value:
->
-> ```
-> Hello, {$userList :list maxEntries=$maxEntries}!
+> Today is {$date :datetime weekday=$dateStyle}!
 > ```
 
 #### Private-Use Annotations
@@ -828,9 +816,9 @@ Otherwise, the set of characters allowed in a _name_ is large.
 Examples:
 > A variable:
 >```
->This has a {$variable}
+> This has a {$variable}
 >```
->A function:
+> A function:
 > ```
 > This has a {:function}
 > ```