From ea2bf1d1f2c26722786e9952f0e15379ecc32bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Ma=C5=82olepszy?= <sta@malolepszy.org>
Date: Wed, 25 May 2022 17:57:56 +0200
Subject: [PATCH] Use "placeholder" consistently; remove mentions of
 "placeable".

---
 spec/message.ebnf |  6 +++---
 spec/syntax.md    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/message.ebnf b/spec/message.ebnf
index 32dd01af30..cae94aca73 100644
--- a/spec/message.ebnf
+++ b/spec/message.ebnf
@@ -7,10 +7,10 @@ Selector ::= (Variable '=')? '{' Expression '}'
 /* Variants and Patterns */
 Variant ::= VariantKey* Pattern
 VariantKey ::= String | Nmtoken | '*'
-Pattern ::= '[' (Text | Placeable)* ']' /* ws: explicit */
+Pattern ::= '[' (Text | Placeholder)* ']' /* ws: explicit */
 
-/* Placeables */
-Placeable ::= '{' (Expression | MarkupStart | MarkupEnd)? '}'
+/* Placeholders */
+Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd)? '}'
 
 /* Expressions */
 Expression ::= Operand Annotation? | Annotation
diff --git a/spec/syntax.md b/spec/syntax.md
index c87f6c3dd2..09592f2083 100644
--- a/spec/syntax.md
+++ b/spec/syntax.md
@@ -19,7 +19,7 @@
    1. [Preamble](#preamble)
    1. [Variants](#variants)
    1. [Patterns](#patterns)
-   1. [Placeables](#placeables)
+   1. [Placeholders](#placeholders)
    1. [Expressions](#expressions)
    1. [Markup Elements](#markup-elements)
 1. [Tokens](#tokens)
@@ -143,7 +143,7 @@ plucking the first name from the object representing a person:
 
 ### Markup Elements
 
-A message with two markup-like element placeables, `button` and `link`,
+A message with two markup-like element placeholders, `button` and `link`,
 which the runtime can use to construct a document tree structure for a UI framework.
 
     [{button}Submit{/button} or {link}cancel{/link}.]
@@ -306,7 +306,7 @@ This serves 3 purposes:
   are translatable and which ones are part of the formatting logic definition.
 
 ```ebnf
-Pattern ::= '[' (Text | Placeable)* ']' /* ws: explicit */
+Pattern ::= '[' (Text | Placeholder)* ']' /* ws: explicit */
 ```
 
 Examples:
@@ -315,12 +315,12 @@ Examples:
 [Hello, world!]
 ```
 
-### Placeables
+### Placeholders
 
-A placeable is a placeholder for an expression or an open or close markup element.
+Placeholders can contain expressions and markup elements.
 
 ```ebnf
-Placeable ::= '{' (Expression | MarkupStart | MarkupEnd) '}'
+Placeholder ::= '{' (Expression | MarkupStart | MarkupEnd) '}'
 ```
 
 ### Expressions