Minor, resolve merge conflicts from recent changes in primary.

README.md

@@ -68,21 +68,23 @@ other interesteed readers are encouraged to check the
 examine the [image-generation logs](/images/README.md) to identify
 issues seen in the inline images.
 
-### Sources
+### References
 
-These documents draw from the following existing resources:
+These documents cite the following informative references:
 
 1. The Microsoft [Script development
    specifications](https://docs.microsoft.com/en-us/typography/script-development/standard),
    which document the behaviors expected for OpenType Layout fonts and
-   provide guidance & examples for type designers.
-2. Related portions of the OpenType specification, such as the
+   provide guidance & examples for type designers. OpenType is a
+   registered trademark of Microsoft Corporation. 
+2. Related portions of the Microsoft OpenType specification, such as the
    [OpenType Layout tag
    registry](https://docs.microsoft.com/en-us/typography/opentype/spec/ttoreg)
    and [OpenType Layout common table
    formats](https://docs.microsoft.com/en-us/typography/opentype/spec/chapter2),
    which list and define feature tags, script & language tags, and
-   other internals of compliant OpenType font binaries.
+   other internals of compliant OpenType font binaries. OpenType is a
+   registered trademark of Microsoft Corporation. 
 3. The [HarfBuzz](https://github.com/harfbuzz/harfbuzz) project, which
    includes a free-software/open-source implementation of OpenType
    Layout shaping with full source code and documentation. 
@@ -94,7 +96,8 @@ These documents draw from the following existing resources:
    related Unicode Consortium projects such as the [Unicode Character
    Database](http://www.unicode.org/reports/tr44/), which defines
    Unicode code points and formal character properties used in
-   shaping.
+   shaping. Unicode and the Unicode Logo are registered trademarks of
+   Unicode, Inc. in the United States and other countries.
 6. The YesLogic [text corpus](https://github.com/yeslogic/corpus),
    which includes real-world text data for several Indic scripts,
    scraped from Wikipedia, Reddit, and multiple online news

opentype-shaping-arabic-general.md

@@ -401,7 +401,7 @@ all scripts implemented with the Arabic shaping model:
 	rclt
 	calt
 
-> Note: RLIG and CALT need to be appled to the word as a whole before
+> Note: `rlig` and `calt` need to be appled to the word as a whole before
 > continuing to the next feature.
 	
 See the individual script pages for further detail on each feature and

opentype-shaping-arabic.md

@@ -561,7 +561,7 @@ all scripts implemented in the Arabic shaping model:
 	rclt
 	calt
 
-> Note: RLIG and CALT need to be appled to the word as a whole before
+> Note: `rlig` and `calt` need to be appled to the word as a whole before
 > continuing to the next feature.
 
 #### 5.1 locl ####

opentype-shaping-emoji.md

@@ -564,8 +564,8 @@ A <abbr>ZWJ</abbr> gendered person sequence is used to request a specific-gender
 version of an emoji codepoint that depicts a single human being.
 
 Each <abbr>ZWJ</abbr> gendered person sequence is composed of an emoji that depicts
-a human by default, followed by `ZWJ`, followed by a gender symbol,
-followed by `_VS16_`.
+a human by default, followed by "ZWJ", followed by a gender symbol,
+followed by "VS16".
 
 ![Gendered person sequence](/images/emoji/gendered-person-sequence.png)
 
@@ -754,7 +754,7 @@ separated by a <abbr>ZWJ</abbr>, and must match:
 
 A <abbr>ZWJ</abbr> role (or profession) sequence is used to request an emoji
 depicting a human being performing a task or job. Role sequences are
-composed of a codepoint representing a human, followed by `ZWJ`,
+composed of a codepoint representing a human, followed by "ZWJ",
 followed by an emoji depicting an object or symbol that references the
 desired profession or role.
 

opentype-shaping-mongolian.md

@@ -87,7 +87,7 @@ context alone.
 To indicate the correct form, the text run can include a **free
 variation selector** immediately after the letter in
 question. There are four free variation selectors in the Mongolian
-block (FVS1, FVS2, FVS3, and FVS4), although some letters have
+block ("FVS1", "FVS2", "FVS3", and "FVS4"), although some letters have
 alternate forms defined only for a subset of the free variation
 selectors.
 
@@ -541,7 +541,7 @@ all scripts implemented in the Arabic shaping model:
 	rclt
 	calt
 
-> Note: RLIG and CALT need to be appled to the word as a whole before
+> Note: `rlig` and `calt` need to be appled to the word as a whole before
 > continuing to the next feature.
 
 #### 5.1 locl ####

opentype-shaping-nko.md

@@ -497,7 +497,7 @@ all scripts implemented in the N'Ko shaping model:
 	rclt (not used in N'Ko)
 	calt
 
-> Note: RLIG and CALT need to be appled to the word as a whole before
+> Note: `rlig` and `calt` need to be appled to the word as a whole before
 > continuing to the next feature.
 
 #### 5.1 locl ####