Merge main into v7.1 (#591)

* Update extracted files (#443) Co-authored-by: Luther Tychonievich <[email protected]> * decribe branches in README.md (#451) * decribe branches in README.md * Update README.md Co-authored-by: Dave Thaler <[email protected]> --------- Co-authored-by: Dave Thaler <[email protected]> * Add contact info to auto-generated YAML files (#454) Per discussion in steering committee meeting 2024-04-04, using <https://gedcom.io/community/> as the contact info because that page describes various means of contact and is expected to be updated from time to time as means of contact change. * Add CI/CD workflow to validate YAML files (#457) * Add CI/CD workflow to validate YAML files Signed-off-by: Dave Thaler <[email protected]> * Update YAML files to resolve yamllint errors Signed-off-by: Dave Thaler <[email protected]> * Update .github/workflows/validate-yaml.yml * Update .github/workflows/validate-yaml.yml --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * yamllint is recursive (#460) Avoid validating the same file multiple times https://github.com/FamilySearch/GEDCOM/actions/runs/8838156091/job/24268618756 under "Validate YAML" shows multiple occurences of files under .github/workflow since .github and .github/workflow are both passed to yamllint Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Add Separation event (#459) * Add Separation event * Remove FS API reference * Fix workflow (#462) https://github.com/FamilySearch/GEDCOM/actions/runs/9044561163 failure reports: "The workflow is not valid. .github/workflows/propagate-main-to-v7.1.yml (Line: 18, Col: 3): The identifier 'merge-to-v7.1' is invalid. IDs may only contain alphanumeric characters, '_', and '-'. IDs must start with a letter or '_' and and must be less than 100 characters." This PR therefore removes the '.' that is causing the failure. Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Track request for Separated as a future FAM attribute (#469) Related to PR #459 which tracks the separation event Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Fix reference to FilePath data type (#466) Fixes #465 Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Typo in README.md (#472) * Add the meaning of WWW (#480) * Add the meaning of WWW Previously (in both 5.5.1 and 7.0.0–7.0.14) `WWW` was defined only by the type of is payload. This is an attempt to fix that without invalidating any existing files. Resolves #476 * Update specification/gedcom-3-structures-3-meaning.md Co-authored-by: Dave Thaler <[email protected]> --------- Co-authored-by: Dave Thaler <[email protected]> * Remove substructure-specific extension wording (#481) Resolves #478 * Add some possible additional family events for consideration (#479) Co-authored-by: Luther Tychonievich <[email protected]> * Clarify no-FORM PLACs (#487) Resolves #486 * Define "principle date" (#492) * Define "principle date" As pointed out in #488 and #490, the definition of DATE includes the vague phrase "principle date" which could use some clarification. This is my effort to provide that clarification. Note, if competing definitions of the principle date in these contexts exists then this suggestion could be seen as backwards-incompatible and may need to be reworded as a non-normative recommendation or note. That said, I'm not aware of any conflicting definitions. Resolves #490 * typos * typo * Update extracted files (#485) Co-authored-by: Luther Tychonievich <[email protected]> * Clarify nickname (#482) * Clarify nickname Add additional clarification to nickname, explaining the word's meaning in English which is not shared by several European countries. See [this comment](#473 (comment)) and the rest of issue #473 for more on why this clarification is needed. Although #473's discussion covers many more topics, if we go back to the title and first question in the issue I think this resolves #473. * Update specification/gedcom-3-structures-3-meaning.md * Change recommendation * Update specification/gedcom-3-structures-3-meaning.md * Update specification/gedcom-3-structures-3-meaning.md --------- Co-authored-by: Dave Thaler <[email protected]> * Update extracted files (#501) Co-authored-by: Luther Tychonievich <[email protected]> * Restore 3.0's definition of jurisdiction (#506) * Restore 3.0's definition of jurisdiction Restored the definition of "jurisdiction" that was present in version 3.0. Resolved #496 * Update specification/gedcom-3-structures-3-meaning.md Additional examples and less proscriptive text * Update extracted files (#508) Co-authored-by: Luther Tychonievich <[email protected]> * Increase largest PLAC example (#514) * Increase largest PLAC example resolves #512 * Update specification/gedcom-3-structures-3-meaning.md * Update extracted files (#515) Co-authored-by: Luther Tychonievich <[email protected]> * Fix validate-yaml warnings (#513) Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> * Update changelog.md (#525) * Update changelog.md We've been making changes without updating the changelog. This summarizes the changes since v7.14 was released. * Update changelog.md * Update changelog.md --------- Co-authored-by: Dave Thaler <[email protected]> * EXID.TYPE for BillionGraves.com and WikiTree identifiers (#540) * EXID.TYPE for BillionGraves.com and WikiTree identifiers Fixes #539 * Update exid-types.json Co-authored-by: Luther Tychonievich <[email protected]> * Apply suggestions from code review Co-authored-by: Luther Tychonievich <[email protected]> --------- Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> * v7.0.15 release (#537) Co-authored-by: Dave Thaler <[email protected]> * Update exid-types.json (#543) * Update exid-types.json Resolve incorrect URIs as noted in #539 * move /name * move /name * move /name * move /name * Clarify a deprecation (#547) * Update extracted files (#542) Co-authored-by: Dave Thaler <[email protected]> * Fix documentation confusion about HEAD-SOUR-DATA (#553) * Make HEAD.SOUR.DATA wording consistent between two places in spec Signed-off-by: Dave Thaler <[email protected]> * Deprecate HEAD.SOUR.DATA Signed-off-by: Dave Thaler <[email protected]> * Update specification/gedcom-3-structures-1-organization.md * Update specification/gedcom-3-structures-3-meaning.md * Update specification/gedcom-3-structures-3-meaning.md --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Add note about blank payloads (#554) * Add note about blank payloads Based on discussion in issue #495 Signed-off-by: Dave Thaler <[email protected]> * Update specification/gedcom-3-structures-1-organization.md * Update specification/gedcom-3-structures-1-organization.md * Update specification/gedcom-3-structures-1-organization.md --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Always quote tags (#560) * Update generate-files to use a PAT (#557) * Fix names of workflows * Make generate-files use a PAT so that validate-yaml will run The PAT is already generated and configured in the repository secrets Fixes #503 Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Update extracted files (#555) Co-authored-by: Dave Thaler <[email protected]> * Don't warn about use of "on" as a YAML key (#562) Per documentation at https://yamllint.readthedocs.io/en/stable/rules.html#module-yamllint.rules.truthy Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Update propagate-main-to-v7.1.yml to use a PAT (#565) So validate-yaml will run Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * add GOV ID to exid-types (#566) * add GOV to exid-types Register gov.genealogy.net, a historical gazeteer maintained by CompGen, using information provided by Albert Emmerich * Update exid-types.json * Update exid-types.json * Remove "month code" as a term (#571) * Remove "month code" as a term Clarifies relationship with standard tags used in the ABNF Fixes #570 Signed-off-by: Dave Thaler <[email protected]> * Update specification/gedcom-6-appendix-calendars.md Co-authored-by: Luther Tychonievich <[email protected]> --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> * Replace exid-types.json with gedcom-registries (#576) Fixes #569 Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: Dave Thaler <[email protected]> * Create exid-types.json to redirect to registries (#585) * add redirection note to old path * Update exid-types.json * Update exid-types.json * Update exid-types.json * Draft recommendation on ASSO (#587) * Draft recommendation on ASSO Addresses #586 by saying ASSO "should" not be used where HUSB/WIFE/CHIL/FAMS/FAMC could work * Update specification/gedcom-3-structures-1-organization.md * Update specification/gedcom-3-structures-1-organization.md * Update extracted files (#589) Co-authored-by: Luther Tychonievich <[email protected]> * Update how tables with URIs in them are parsed (#590) * Update how tables with URIs in them are parsed Resolves #574 * Add the extracted files this PR changes * Fix over-eager change of tag names to enum-TAG --------- Signed-off-by: Dave Thaler <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Luther Tychonievich <[email protected]> Co-authored-by: Luther Tychonievich <[email protected]> Co-authored-by: Dave Thaler <[email protected]> Co-authored-by: Christopher Horn <[email protected]> Co-authored-by: Dylan Stephano-Shachter <[email protected]> Co-authored-by: elyoh <[email protected]>
FamilySearch · Feb 11, 2025 · 80e2ad4 · 80e2ad4
1 parent 1584f5b
commit 80e2ad4
Show file tree

Hide file tree

Showing 26 changed files with 151 additions and 261 deletions.
diff --git a/.github/workflows/propagate-main-to-v7.1.yml b/.github/workflows/propagate-main-to-v7.1.yml
@@ -49,4 +49,4 @@ jobs:
             gh pr create -B v7.1 -H merge-main-into-v7.1 --title 'Merge main into v7.1' --body $'Copy changes from main to v7.1\nThis PR is auto-generated by [gh pr create].' --label 'automated pr' --repo ${{ github.repository }}
           fi
         env:
-          GH_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
diff --git a/README.md b/README.md
@@ -11,7 +11,6 @@ If you are looking for FamilySearch's GEDCOM 5.5.1 Java parser, which previously
 ## Repository structure
 
 - [`changelog.md`](changelog.md) is a running log of major changes made to the specification.
-- [`exid-types.json`](exid-types.json) is a JSON file containing registered EXID-TYPE values.
 - [`specification/`](specification/) contains the FamilySearch GEDCOM specification:
 	- `specification/gedcom-`number`-`title`.md` files are the source documents used to define the FamilySearch GEDCOM specification. It is written in pandoc-flavor markdown and is intended to be more easily written than read. It is split into several files (ordered by the integer in their names) to facilitate comparing files.
 	- In a local check-out, this is also where the build scripts place rendered files `gedcom.html` and `gedcom.pdf`; see [releases](releases/latest) for a pre-rendered copy of these.

diff --git a/build/uri-def.py b/build/uri-def.py
@@ -251,7 +251,9 @@ def find_descriptions(txt, g7, ssp):
         if header.startswith('Fam'): pfx = 'FAM-'
         if header.startswith('Indi'): pfx = 'INDI-'
         for tag, name, desc in re.findall(r'`([A-Z_0-9]+)` *\| *([^|\n]*?) *\| *([^|\n]*[^ |\n]) *', table.group(2)):
-            if '<br' in name: name = name[:name.find('<br')]
+            if '<br' in name:
+                tag = name[name.find('`g7:')+4:name.rfind('`')]
+                name = name[:name.find('<br')]
             if tag not in g7: tag = pfx+tag
             if tag not in g7:
                 raise Exception('Found table for '+tag+' but no section or structure')
@@ -270,14 +272,16 @@ def find_enum_by_link(txt, enums, tagsets):
             # 'g7:INDI-FACT',
             # 'g7:FAM-FACT',
         # ))         ## do not do for enumset-EVEN 
+    enum_prefix = {k[k.find('enum-')+5:] for e in enums.values() for k in e }
     for sect in re.finditer(r'# *`(g7:enumset-[^`]*)`[\s\S]*?\n#', txt):
         if '[Events]' in sect.group(0):
             key = sect.group(1).replace('`','').replace('.','-')
             for k in tagsets:
                 if 'Event' in k:
                     enums.setdefault(key, [])
                     for tag in tagsets[k]:
-                        tag = tag.replace('INDI-','enum-').replace('FAM-','enum-')
+                        if tag.startswith('INDI-') and tag[5:] in enum_prefix: tag = 'enum-'+tag[5:]
+                        if tag.startswith('FAM-') and tag[4:] in enum_prefix: tag = 'enum-'+tag[4:]
                         tag = 'g7:'+tag
                         if tag in enums[key]: continue
                         enums[key].append(tag)
@@ -287,7 +291,8 @@ def find_enum_by_link(txt, enums, tagsets):
                 if 'Attribute' in k:
                     enums.setdefault(key, [])
                     for tag in tagsets[k]:
-                        tag = tag.replace('INDI-','enum-').replace('FAM-','enum-')
+                        if tag.startswith('INDI-') and tag[5:] in enum_prefix: tag = 'enum-'+tag[5:]
+                        if tag.startswith('FAM-') and tag[4:] in enum_prefix: tag = 'enum-'+tag[4:]
                         tag = 'g7:'+tag
                         if tag in enums[key]: continue
                         enums[key].append(tag)

diff --git a/exid-types.json b/exid-types.json
@@ -1,108 +1,5 @@
-[
-  {
-    "label": "AFN",
-    "type": "https://gedcom.io/terms/v7/AFN",
-    "description": "Ancestral File Number",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/migrate/#afn-rfn-rin"
-  },
-  {
-    "label": "RIN",
-    "type": "https://gedcom.io/terms/v7/RIN",
-    "description": "Automated Record ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "fragment": "Source System",
-    "reference": "https://gedcom.io/migrate/#afn-rfn-rin"
-  },
-  {
-    "label": "RFN",
-    "type": "https://gedcom.io/terms/v7/RFN",
-    "description": "Permanent Record ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "fragment": "Resource ID",
-    "reference": "https://gedcom.io/migrate/#afn-rfn-rin"
-  },
-  {
-    "label": "FamilySearch Memory ID",
-    "type": "https://gedcom.io/exid-type/FamilySearch-MemoryId",
-    "description": "FamilySearch Memory ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/exid-type/FamilySearch-MemoryId"
-  },
-  {
-    "label": "FamilySearch Person ID",
-    "type": "https://gedcom.io/exid-type/FamilySearch-PersonId",
-    "description": "FamilySearch Person ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/exid-type/FamilySearch-PersonId"
-  },
-  {
-    "label": "FamilySearch Place ID",
-    "type": "https://gedcom.io/exid-type/FamilySearch-PlaceId",
-    "description": "FamilySearch Place ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/exid-type/FamilySearch-PlaceId"
-  },
-  {
-    "label": "FamilySearch Source Description ID",
-    "type": "https://gedcom.io/exid-type/FamilySearch-SourceDescriptionId",
-    "description": "FamilySearch Source Description ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/exid-type/FamilySearch-SourceDescriptionId"
-  },
-  {
-    "label": "FamilySearch User ID",
-    "type": "https://gedcom.io/exid-type/FamilySearch-UserId",
-    "description": "FamilySearch User ID",
-    "contact": "[email protected]",
-    "change-controller": "FamilySearch",
-    "reference": "https://gedcom.io/exid-type/FamilySearch-UserId"
-  },
-  {
-    "label": "FindAGrave Memorial ID",
-    "type": "https://www.findagrave.com/memorial",
-    "description": "FindAGrave Memorial ID",
-    "contact": "[email protected]",
-    "change-controller": "FindAGrave.com",
-    "reference": "https://support.findagrave.com/s/article/Memorial-Search"
-  },
-  {
-    "label": "FindAGrave Cemetery ID",
-    "type": "https://www.findagrave.com/cemetery",
-    "description": "FindAGrave Cemetery ID",
-    "contact": "[email protected]",
-    "change-controller": "FindAGrave.com",
-    "reference": "https://support.findagrave.com/s/article/Cemetery-Search"
-  }
-  {
-    "label": "BillionGraves Grave ID",
-    "type": "https://www.billiongraves.com/grave/name/",
-    "description": "BillionGraves Grave ID",
-    "contact": "[email protected]",
-    "change-controller": "BillionGraves.com",
-    "reference": "https://billiongraves.com/search"
-  },
-  {
-    "label": "BillionGraves Cemetery ID",
-    "type": "https://www.billiongraves.com/cemetery/name/",
-    "description": "BillionGraves Cemetery ID",
-    "contact": "[email protected]",
-    "change-controller": "BillionGraves.com",
-    "reference": "https://billiongraves.com/search/cemetery"
-  }
-  {
-    "label": "WikiTree Person ID",
-    "type": "https://www.wikitree.com/wiki/",
-    "description": "WikiTree Person ID",
-    "contact": "[email protected]",
-    "change-controller": "wikitree.com",
-    "reference": "https://www.wikitree.com/wiki/Help:WikiTree_ID"
-  },
-]
+{
+    "error": "This file has been removed",
+    "replaced by": "https://github.com/FamilySearch/GEDCOM-registries/tree/main/uri/exid-types",
+    "rationale": "This file previously contained an incomplete and inconsistent subset of information now found the YAML files in the GEDCOM registries. See https://github.com/FamilySearch/GEDCOM/pull/576 for more information about this change."
+}
diff --git a/extracted-files/enumerationsets.tsv b/extracted-files/enumerationsets.tsv
@@ -75,9 +75,9 @@ https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/NATI
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/NMR
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/OCCU
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/PROP
-https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/RELI
+https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/INDI-RELI
 https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/SSN
-https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/TITL
+https://gedcom.io/terms/v7/enumset-EVENATTR	https://gedcom.io/terms/v7/INDI-TITL
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-AUDIO
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-BOOK
 https://gedcom.io/terms/v7/enumset-MEDI	https://gedcom.io/terms/v7/enum-CARD

diff --git a/extracted-files/tags/EXID-TYPE b/extracted-files/tags/EXID-TYPE
@@ -19,21 +19,8 @@ specification:
     payload to it yields that URL. However, this is not required and a different
     URI for the set of issued identifiers may be used instead.
 
-    Registered URIs are listed in [exid-types.json], where fields include:
-
-    - "label": a short string suitable for display in a user interface.
-    - "type": The URI representing the authority issuing the `EXID`.
-    - "description": A description of the meaning of the `EXID`.
-    - "contact": A contact email address for the person or organization registering
-      the URI.
-    - "change-controller": The name or contact information for the person or
-      organization authorized to update the registration.
-    - "fragment": If present, indicates a short string that can be used as a label
-      for a fragment identifier appended to the URI. If absent, indicates that
-      fragment identifiers are not used with the URI.
-    - "reference": A URL with more information about the meaning of the `EXID`.
-      Such information should explain the uniqueness and expected durability of the
-      identifier.
+    Registered URIs are listed in the [exid-types registry], where fields are
+    defined using the [YAML file format].
 
     Additional type URIs can be registered by filing a [GitHub pull request].
 

diff --git a/extracted-files/tags/FILE b/extracted-files/tags/FILE
@@ -10,8 +10,7 @@ standard tag: 'FILE'
 
 specification:
   - File reference
-  - A reference to an external file. See the [File Path datatype] for more
-    details.
+  - A reference to an external file. See the [File Path datatype] for more details.
 
 label: 'File reference'
 

diff --git a/extracted-files/tags/HEAD-LANG b/extracted-files/tags/HEAD-LANG
@@ -16,8 +16,7 @@ specification:
     structure. An application may choose to use a different default based on its
     knowledge of the language preferences of the user.
 
-    The payload of the `LANG` structure is a language tag, as defined by [BCP
-    47].
+    The payload of the `LANG` structure is a language tag, as defined by [BCP 47].
 
     <div class="note">
 

diff --git a/extracted-files/tags/INDI-RELI b/extracted-files/tags/INDI-RELI
@@ -11,6 +11,9 @@ standard tag: 'RELI'
 specification:
   - Religion
   - An [Individual Attribute]. See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
+  - religion
+  - A religious denomination to which a person is affiliated or for which a record
+    applies.
 
 label: 'Religion'
 
@@ -41,5 +44,8 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
+value of:
+  - "https://gedcom.io/terms/v7/enumset-EVENATTR"
+
 contact: "https://gedcom.io/community/"
 ...
diff --git a/extracted-files/tags/INDI-TITL b/extracted-files/tags/INDI-TITL
@@ -11,6 +11,9 @@ standard tag: 'TITL'
 specification:
   - Title
   - An [Individual Attribute]. See also `INDIVIDUAL_ATTRIBUTE_STRUCTURE`.
+  - title
+  - A formal designation used by an individual in connection with positions of
+    royalty or other social status, such as Grand Duke.
 
 label: 'Title'
 
@@ -41,5 +44,8 @@ substructures:
 superstructures:
   "https://gedcom.io/terms/v7/record-INDI": "{0:M}"
 
+value of:
+  - "https://gedcom.io/terms/v7/enumset-EVENATTR"
+
 contact: "https://gedcom.io/community/"
 ...
diff --git a/extracted-files/tags/LANG b/extracted-files/tags/LANG
@@ -14,8 +14,8 @@ specification:
     The primary human language of the superstructure. The primary language in which
     the `Text`-typed payloads of the superstructure and its substructures appear.
 
-    The payload of the `LANG` structure is a language tag, as defined by [BCP
-    47]. A [registry of component subtags] is maintained publicly by the IANA.
+    The payload of the `LANG` structure is a language tag, as defined by [BCP 47].
+    A [registry of component subtags] is maintained publicly by the IANA.
 
     In the absence of a `LANG` structure, the language is assumed to be
     unspecified; that may also be recorded explicitly with language tag `und`

diff --git a/extracted-files/tags/NAME-TRAN b/extracted-files/tags/NAME-TRAN
@@ -11,8 +11,8 @@ standard tag: 'TRAN'
 specification:
   - Translation
   - |
-    A type of `TRAN` substructure specific to [Personal Names]. Each
-    `NAME`.`TRAN` must have a `LANG` substructure. See also `INDI`.`NAME`.
+    A type of `TRAN` substructure specific to [Personal Names]. Each `NAME`.`TRAN`
+    must have a `LANG` substructure. See also `INDI`.`NAME`.
 
     <div class="example">
 

diff --git a/extracted-files/tags/RELI b/extracted-files/tags/RELI
@@ -12,9 +12,6 @@ specification:
   - Religion
   - A religious denomination associated with the event or attribute described by
     the superstructure.
-  - religion
-  - A religious denomination to which a person is affiliated or for which a record
-    applies.
 
 label: 'Religion'
 
@@ -75,8 +72,5 @@ superstructures:
   "https://gedcom.io/terms/v7/SSN": "{0:1}"
   "https://gedcom.io/terms/v7/WILL": "{0:1}"
 
-value of:
-  - "https://gedcom.io/terms/v7/enumset-EVENATTR"
-
 contact: "https://gedcom.io/community/"
 ...
diff --git a/extracted-files/tags/SUBM-LANG b/extracted-files/tags/SUBM-LANG
@@ -13,8 +13,7 @@ specification:
   - |
     A language the subject of that record understands.
 
-    The payload of the `LANG` structure is a language tag, as defined by [BCP
-    47].
+    The payload of the `LANG` structure is a language tag, as defined by [BCP 47].
 
 label: 'Language'
 

diff --git a/extracted-files/tags/TITL b/extracted-files/tags/TITL
@@ -37,9 +37,6 @@ specification:
     the `SOURCE_RECORD` substructures `AUTH`, `PUBL`, `REPO`, and so on. In such
     cases, the entire citation text may be presented as the payload of the
     `SOUR`.`TITL`.
-  - title
-  - A formal designation used by an individual in connection with positions of
-    royalty or other social status, such as Grand Duke.
 
 label: 'Title'
 
@@ -52,8 +49,5 @@ superstructures:
   "https://gedcom.io/terms/v7/OBJE": "{0:1}"
   "https://gedcom.io/terms/v7/record-SOUR": "{0:1}"
 
-value of:
-  - "https://gedcom.io/terms/v7/enumset-EVENATTR"
-
 contact: "https://gedcom.io/community/"
 ...
diff --git a/extracted-files/tags/WWW b/extracted-files/tags/WWW
@@ -12,8 +12,8 @@ specification:
   - Web address
   - |
     A URL or other locator for a World Wide Web page of the subject of the
-    superstructure, as defined by any relevant standard such as [whatwg/url],
-    [RFC 3986], [RFC 3987], and so forth.
+    superstructure, as defined by any relevant standard such as [whatwg/url], [RFC
+    3986], [RFC 3987], and so forth.
 
     Like other substructures, the `WWW` structure provides details about the
     subject of its superstructure. For example, a `MARR`.`WWW` is a world wide web

diff --git a/extracted-files/tags/cal-FRENCH_R b/extracted-files/tags/cal-FRENCH_R
@@ -17,21 +17,21 @@ specification:
 
     Permitted months are
 
-    | Code   | Name                 |
-    | :----- | :------------------- |
-    | `VEND` | Vendémiaire          |
-    | `BRUM` | Brumaire             |
-    | `FRIM` | Frimaire             |
-    | `NIVO` | Nivôse               |
-    | `PLUV` | Pluviôse             |
-    | `VENT` | Ventôse              |
-    | `GERM` | Germinal             |
-    | `FLOR` | Floréal              |
-    | `PRAI` | Prairial             |
-    | `MESS` | Messidor             |
-    | `THER` | Thermidor            |
-    | `FRUC` | Fructidor            |
-    | `COMP` | Jour Complémentaires |
+    | `stdTag` | Name                 |
+    | :------- | :------------------- |
+    | `VEND`   | Vendémiaire          |
+    | `BRUM`   | Brumaire             |
+    | `FRIM`   | Frimaire             |
+    | `NIVO`   | Nivôse               |
+    | `PLUV`   | Pluviôse             |
+    | `VENT`   | Ventôse              |
+    | `GERM`   | Germinal             |
+    | `FLOR`   | Floréal              |
+    | `PRAI`   | Prairial             |
+    | `MESS`   | Messidor             |
+    | `THER`   | Thermidor            |
+    | `FRUC`   | Fructidor            |
+    | `COMP`   | Jour Complémentaires |
 
     No epoch marker is permitted in this calendar.