Merge branch 'main' into token

build/uri-def.py

@@ -396,7 +396,7 @@ def expand_prefix(txt, prefixes):
 
             if g7[tag][0] in ('structure', 'enumeration', 'calendar', 'month'):
                 ptag = re.sub(r'.*-', '', re.sub(r'-[A-Z]?[a-z].*', '', tag))
-                print('\nstandard tag: '+(repr(ptag) if ptag in ('YES','NO','TRUE','FALSE', '0', '1', '2', '3') else ptag), file=fh)
+                print('\nstandard tag: '+repr(ptag), file=fh)
 
             if len(g7[tag][1]) > 0:
                 print('\nspecification:', file=fh)

specification/gedcom-3-structures-1-organization.md

@@ -166,9 +166,12 @@ A few substructures of note:
 - `SCHMA` gives the meaning of extension tags; see [Extensions](#extensions) for more details.
 - `SOUR` describes the originating software.
     - `CORP` describes the corporation creating the software.
-    - `HEAD`.`SOUR`.`DATA` describes a larger database this data is extracted from.
+    - `HEAD`.`SOUR`.`DATA` describes a larger database, electronic data source, or digital repository this data is extracted from.
 - `LANG` and `PLAC` give a default value for the rest of the document.
 
+:::deprecation
+`HEAD`.`SOUR`.`DATA` is now deprecated and applications should use `HEAD`.`SOUR`.`NAME` instead.
+:::
 
 ### Records
 
@@ -1138,6 +1141,12 @@ A place, which can be represented in several ways:
     or in the `HEAD`.`PLAC`.`FORM` if there is no `FORM` substructure.
     If neither `FORM` exists, the meaning of the elements are not defined in this specification beyond being names of jurisdictions of some kind, ordered from smallest to largest.
 
+    <div class="note">
+    Some applications and users have defaulted to assuming a `FORM` of "City, County, State, Country",
+    and some applications even ignore any `FORM` substructures and treat payloads with a smaller number of
+    elements as if they had additional blank elements at the end.
+    </div>
+
     Elements should be left blank if they are unknown, do not apply to the location, or are too specific for the region in question.
 
     <div class="example">

specification/gedcom-3-structures-3-meaning.md

@@ -428,9 +428,9 @@ See `g7:DATA`.
 
 #### `DATA` (Data) `g7:HEAD-SOUR-DATA`
 
-The electronic data source or digital repository from which this dataset was exported.
-The payload is the name of that source,
-with substructures providing additional details about the source (not the export).
+The database, electronic data source, or digital repository from which this dataset was exported.
+The payload is the name of the database, electronic data source, or digital repository,
+with substructures providing additional details about it (not about the export).
 
 #### `DATE` (Date) `g7:DATE`