diff --git a/mlir/docs/Dialects/Affine.md b/mlir/docs/Dialects/Affine.md
--- a/mlir/docs/Dialects/Affine.md
+++ b/mlir/docs/Dialects/Affine.md
@@ -142,7 +142,7 @@
 
 ```
 affine-map-inline
-   ::= dim-and-symbol-id-lists `->` multi-dim-affine-expr
+   ::= dim-and-symbol-value-lists `->` multi-dim-affine-expr
 ```
 
 The identifiers in the dimensions and symbols lists must be unique. These are
@@ -227,7 +227,7 @@
 
 ```
 semi-affine-map-inline
-   ::= dim-and-symbol-id-lists `->` multi-dim-semi-affine-expr
+   ::= dim-and-symbol-value-lists `->` multi-dim-semi-affine-expr
 ```
 
 Semi-affine maps may be defined inline at the point of use, or may be hoisted to
@@ -271,7 +271,7 @@
 integer-set-id ::= `#` suffix-id
 
 integer-set-inline
-   ::= dim-and-symbol-id-lists `:` '(' affine-constraint-conjunction? ')'
+   ::= dim-and-symbol-value-lists `:` '(' affine-constraint-conjunction? ')'
 
 // Declarations of integer sets are at the top of the file.
 integer-set-decl ::= integer-set-id `=` integer-set-inline
diff --git a/mlir/docs/LangRef.md b/mlir/docs/LangRef.md
--- a/mlir/docs/LangRef.md
+++ b/mlir/docs/LangRef.md
@@ -207,7 +207,7 @@
 value-id-list ::= value-id (`,` value-id)*
 
 // Uses of value, e.g. in an operand list to an operation.
-value-use ::= value-id
+value-use ::= value-id (`#` decimal-literal)?
 value-use-list ::= value-use (`,` value-use)*
 ```
 
@@ -294,13 +294,13 @@
                           `:` function-type
 custom-operation      ::= bare-id custom-operation-format
 op-result-list        ::= op-result (`,` op-result)* `=`
-op-result             ::= value-id (`:` integer-literal)
+op-result             ::= value-id (`:` integer-literal)?
 successor-list        ::= `[` successor (`,` successor)* `]`
 successor             ::= caret-id (`:` block-arg-list)?
 dictionary-properties ::= `<` dictionary-attribute `>`
 region-list           ::= `(` region (`,` region)* `)`
 dictionary-attribute  ::= `{` (attribute-entry (`,` attribute-entry)*)? `}`
-trailing-location     ::= (`loc` `(` location `)`)?
+trailing-location     ::= `loc` `(` location `)`
 ```
 
 MLIR introduces a uniform concept called *operations* to enable describing many