diff --git a/quick-reference.markdown b/quick-reference.markdown
index aaf3cba..d550ff7 100644
--- a/quick-reference.markdown
+++ b/quick-reference.markdown
@@ -198,10 +198,10 @@
 
 ### Sections (`sectioning.xml`)
 
-| Item          | Element(s)    | Attributes            | Notes
-| ----          | ----------    | ----------            | -----
-| section       | `section`     | `label=`*`<string>`*  |
-| section title | `title`       |                       | within `<section>`
+| Item          | Element(s)    | Attributes                | Notes
+| ----          | ----------    | ----------                | -----
+| section       | `section`     | `[label=`*`<string>`*`]`  |
+| section title | `title`       |                           | within `<section>`
 
 ### Document title (`titling.xml`)
 
@@ -283,23 +283,31 @@
 | ----              | ----------                | ----------                    | -----
 | image             | `image`                   | `basename=`*`<filename>`*     | without suffix
 |                   |                           | `format=`*`<string>`*         | e.g., “png”, “pdf”
-|                   |                           | `inline=`**`no`**`|yes`       | image will be scaled to line height
-|                   |                           | `latex-options=`*`<string>`*  | pass-through LaTeX options
 |                   |                           | `location=`*`<path>`*         |
+|                   |                           | `[inline=`**`no`**`|yes]`       | image will be scaled to line height
+|                   |                           | `[latex-options=`*`<string>]`*  | pass-through LaTeX options
 | zoomable image    | `provide-large-version`   |                               | within `<image>`
 
 ### Floating elements (`floaters.xml`)
 
 | Item              | Element(s)    | Attributes                                                    | Notes
 | ----              | ----------    | ----------                                                    | -----
-| figure            | `figure`      | `border-placement=box|`**`none`**`|{bottom|left|right|top}`   |
-|                   |               | `label=`*`<string>`*                                          |
-|                   |               | `latex-placement=`*`<string>`*                                | LaTeX only; usually `b|h|p|t`
-| table             | `table`       | `border-placement=box|`**`none`**`|{bottom|left|right|top}`   |
-|                   |               | `label=`*`<string>`*                                          |
-|                   |               | `latex-placement=`*`<string>`*                                |
-| multipart table   | `part`        |                                                               | within `<table>`
 | caption           | `caption`     |                                                               | within `<figure>` or `<table>`
+| figure            | `figure`      | `[border-placement=box|`**`none`**`|{bottom|left|right|top}]` |
+|                   |               | `[label=`*`<string>]`*                                        |
+|                   |               | `[latex-placement=`*`<string>]`*                              | LaTeX only; usually `b|h|p|t`
+| multipart table   | `part`        |                                                               | within `<table>`
+| table             | `table`       | `[border-placement=box|`**`none`**`|{bottom|left|right|top}]` |
+|                   |               | `[label=`*`<string>]`*                                        |
+|                   |               | `[latex-placement=`*`<string>]`*                              |
+
+### Cross references (`cross-references.xml`)
+
+| Item          | Element(s)    | Attributes                            | Notes
+| ----          | ----------    | ----------                            | -----
+| page label    | `page`        | `label=`*`<string>`*                  |
+| reference     | `reference`   | `label=`*`<string>`*                  |
+|               |               | `[include-pageref=`**`no`**`|yes]`    |
 
 ### Bibliographies (`bibliography.xml`)
 
@@ -707,16 +715,6 @@
 | column                | `column`          | `[align=center|`**`left`**`|right]`                               |
 |                       |                   | `[width=`*`<decimal>`*`]`                                         | between `0` and `1`
 
-modules/cross-references.xml:   <template name="reference" match="reference[@label]">
-modules/cross-references.xml:   <template name="broken-reference" match="reference[not( @label )]">
-modules/cross-references.xml:   <template name="section-reference" match="section" mode="reference">
-modules/cross-references.xml:   <template name="figure-reference" match="figure" mode="reference">
-modules/cross-references.xml:   <template name="table-reference" match="table" mode="reference">
-modules/cross-references.xml:   <template name="exercise-reference" match="exercise" mode="reference">
-modules/cross-references.xml:   <template name="item-page-reference" match="section|figure|table" mode="page-reference">
-modules/cross-references.xml:   <template name="page" match="page[@label]">
-modules/cross-references.xml:   <template name="broken-page" match="page[not( @label )]">
-modules/cross-references.xml:   <template name="direct-page-reference" match="page[@label]" mode="reference">
 modules/hyperlinks.xml: <template name="hyperlink-label" match="hyperlink[@label and node()]">
 modules/hyperlinks.xml: <template name="hyperlink-url" match="hyperlink[@url and node()]">
 modules/hyperlinks.xml: <template name="empty-hyperlink-url" match="hyperlink[@url and not( node() )]">