From 34f92c387046e3b2fdb61af30d5e284c5aacafc9 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Wed, 15 Mar 2023 15:17:37 +0100
Subject: [PATCH] Copy across easy wins from the wip branch

---
 README.md                      |  1 +
 _config.yml                    |  4 ++--
 _includes/cheatsheet-binary.md |  1 +
 _layouts/redirect.html         |  9 +++++++++
 cheatsheet.md                  | 11 +++++++++++
 conventions.md                 | 15 ++++-----------
 preserves.md                   |  2 +-
 7 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 _includes/cheatsheet-binary.md
 create mode 100644 _layouts/redirect.html
 create mode 100644 cheatsheet.md

diff --git a/README.md b/README.md
index fffa652..c0928ea 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ Implementations of the data model, plus Syrup transfer syntax:
 
 ## Additional resources
 
+ - [Cheat sheet(s) for Preserves syntax](cheatsheet.html)
  - Some [conventions for common data types](conventions.html)
  - [Open questions](questions.html); see also the
    [issues list]({{page.projectpages}}/issues)
diff --git a/_config.yml b/_config.yml
index 4fa82f2..0e77be8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,5 +13,5 @@ defaults:
       layout: page
 
 title: "Preserves"
-version_date: "February 2023"
-version: "0.6.4"
+version_date: "March 2023"
+version: "0.7.0"
diff --git a/_includes/cheatsheet-binary.md b/_includes/cheatsheet-binary.md
new file mode 100644
index 0000000..292daab
--- /dev/null
+++ b/_includes/cheatsheet-binary.md
@@ -0,0 +1 @@
+(TODO)
diff --git a/_layouts/redirect.html b/_layouts/redirect.html
new file mode 100644
index 0000000..5db4f53
--- /dev/null
+++ b/_layouts/redirect.html
@@ -0,0 +1,9 @@
+---
+layout: skeleton
+extra_html_headers: |
+  <link rel="canonical" href="{{ site.baseurl }}{{ page.redirect_target }}">
+  <meta http-equiv="Refresh" content="0; URL={{ site.baseurl }}{{ page.redirect_target }}">
+---
+<h1>Redirecting</h1>
+
+<p>Redirecting you to <a href="{{ site.baseurl }}{{ page.redirect_target }}">{{ page.redirect_target }}</a>.</p>
diff --git a/cheatsheet.md b/cheatsheet.md
new file mode 100644
index 0000000..7f391e6
--- /dev/null
+++ b/cheatsheet.md
@@ -0,0 +1,11 @@
+---
+no_site_title: true
+title: "Preserves Cheatsheets"
+---
+
+Tony Garnock-Jones <tonyg@leastfixedpoint.com>  
+{{ site.version_date }}. Version {{ site.version }}.
+
+## Machine-Oriented Binary Syntax
+
+{% include cheatsheet-binary.md %}
diff --git a/conventions.md b/conventions.md
index d5dd809..b82a236 100644
--- a/conventions.md
+++ b/conventions.md
@@ -112,17 +112,10 @@ such media types following the general rules for ordering of
 
 **Examples.**
 
-    «<mime application/octet-stream #"abcde">»
-      = B4 B3 04 "mime" B3 18 "application/octet-stream" B2 05 "abcde"
-
-    «<mime text/plain #"ABC">»
-      = B4 B3 04 "mime" B3 0A "text/plain" B2 03 "ABC" 84
-
-    «<mime application/xml #"<xhtml/>">»
-      = B4 B3 04 "mime" B3 0F "application/xml" B2 08 "<xhtml/>" 84
-
-    «<mime text/csv #"123,234,345">»
-      = B4 B3 04 "mime" B3 08 "text/csv" B2 0B "123,234,345" 84
+    <mime application/octet-stream #"abcde">
+    <mime text/plain #"ABC">
+    <mime application/xml #"<xhtml/>">
+    <mime text/csv #"123,234,345">
 
 ## Unicode normalization forms.
 
diff --git a/preserves.md b/preserves.md
index 8e66ab7..02c89e9 100644
--- a/preserves.md
+++ b/preserves.md
@@ -190,7 +190,7 @@ domain-specific rules.
     `Embedded` rewriting without the quotation-related complications
     of encoding references as, say, `Record`s.
 
-*Examples.* In a Java or Python implementation, an `Embedded` may
+*Motivating Examples.* In a Java or Python implementation, an `Embedded` may
 denote a reference to a Java or Python object; comparison would be
 done via the language's own rules for equivalence and ordering. In a
 Unix application, an `Embedded` may denote an open file descriptor or