Merge branch 'master' into desugar

10 files changed, 11 insertions, 11 deletions

diff --git a/apps/Readme.md b/apps/Readme.md
index b76c5a8b..1861d949 100644
--- a/apps/Readme.md
+++ b/apps/Readme.md
@@ -1,2 +1,2 @@
-Larger programs than in the subx/examples/ subdirectory, combining the
-techniques demonstrated there.
+Larger programs than in the examples/ subdirectory, combining the techniques
+demonstrated there.
diff --git a/apps/assort.subx b/apps/assort.subx
index 801e52d0..917dfb5c 100644
--- a/apps/assort.subx
+++ b/apps/assort.subx
@@ -6,7 +6,7 @@
 # Drop lines that are all comments. They could get misleading after assortment
 # because we don't know if they refer to the line above or the line below.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/assort.subx -o apps/assort
 #   $ cat x
 #   == code
diff --git a/apps/crenshaw2-1.subx b/apps/crenshaw2-1.subx
index 0c3f180b..079ffb26 100644
--- a/apps/crenshaw2-1.subx
+++ b/apps/crenshaw2-1.subx
@@ -2,7 +2,7 @@
 # which corresponds to the section "single digits" in https://compilers.iecc.com/crenshaw/tutor2.txt
 # except that we support hex digits.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/crenshaw2-1.subx -o apps/crenshaw2-1
 #   $ echo '3'  |./subx run apps/crenshaw2-1
 # Expected output:
diff --git a/apps/crenshaw2-1b.subx b/apps/crenshaw2-1b.subx
index e1bb6448..064af459 100644
--- a/apps/crenshaw2-1b.subx
+++ b/apps/crenshaw2-1b.subx
@@ -2,7 +2,7 @@
 # which corresponds to the section "single digits" in https://compilers.iecc.com/crenshaw/tutor2.txt
 # except that we support hex numbers of multiple digits.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/crenshaw2-1b.subx -o apps/crenshaw2-1b
 #   $ echo '1a'  |./subx run apps/crenshaw2-1b
 # Expected output:
diff --git a/apps/dquotes.subx b/apps/dquotes.subx
index b1bc0b81..083b295f 100644
--- a/apps/dquotes.subx
+++ b/apps/dquotes.subx
@@ -1,7 +1,7 @@
 # Translate literal strings within double quotes.
 # Replace them with references to new variables in the data segment.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/dquotes.subx -o apps/dquotes
 #   $ cat x
 #   == code
diff --git a/apps/factorial.subx b/apps/factorial.subx
index e4b7a057..f28a3657 100644
--- a/apps/factorial.subx
+++ b/apps/factorial.subx
@@ -1,6 +1,6 @@
 ## compute the factorial of 5, and return the result in the exit code
 #
-# To run (from the subx directory):
+# To run:
 #   $ ./subx translate apps/factorial.subx -o apps/factorial
 #   $ ./subx run apps/factorial
 # Expected result:
diff --git a/apps/handle.subx b/apps/handle.subx
index ba824f85..95364821 100644
--- a/apps/handle.subx
+++ b/apps/handle.subx
@@ -12,7 +12,7 @@
 #   offset 0: alloc id
 #   offset 4: address
 #
-# To run (from the subx directory):
+# To run:
 #   $ ./subx translate *.subx apps/handle.subx -o apps/handle
 #   $ ./subx run apps/handle
 # Expected result is a successful lookup followed by a hard abort:
diff --git a/apps/hex.subx b/apps/hex.subx
index a24c5a2e..02f29b5e 100644
--- a/apps/hex.subx
+++ b/apps/hex.subx
@@ -2,7 +2,7 @@
 # from stdin, and convert them into binary bytes (octets) on stdout. Ignore
 # comments between '#' and newline.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/hex.subx -o apps/hex
 #   $ echo '80 81 82  # comment'  |./subx run apps/hex  |xxd -
 # Expected output:
diff --git a/apps/pack.subx b/apps/pack.subx
index 00263af4..9499f3b3 100644
--- a/apps/pack.subx
+++ b/apps/pack.subx
@@ -2,7 +2,7 @@
 # of whitespace-separated ascii hex bytes on stdout. Label definitions and
 # uses are left untouched.
 #
-# To run (from the subx/ directory):
+# To run:
 #   $ ./subx translate *.subx apps/pack.subx -o apps/pack
 #   $ echo '05/add-to-EAX 0x20/imm32'  |./subx run apps/pack
 # Expected output:
diff --git a/apps/survey.subx b/apps/survey.subx
index 15957fa2..14f4eb55 100644
--- a/apps/survey.subx
+++ b/apps/survey.subx
@@ -4,7 +4,7 @@
 #   a) replace labels
 #   b) add segment headers with addresses and offsets correctly filled in
 #
-# To build (from the subx/ directory):
+# To build:
 #   $ ./subx translate *.subx apps/survey.subx -o apps/survey
 #
 # The expected input is a stream of bytes with segment headers, comments and