Skip to content

Commit 781c7ca

Browse files
dthalergithub-actions[bot]tychonievichdthaler2cdhorn
authored
Merge main into v7.1 (#609)
* 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 * replace "entities" with "tags" in HTML (#594) Addresses an issue raised in #593 * Update extracted files (#595) * Add recommendation about citing parent-child relationships (#599) * Add recommendation about citing parent-child relationships Fixes #586 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]> * Update changelog to reflect current main branch (#606) * Update changelog to reflect current main branch * Update changelog.md * Update changelog.md * Update changelog.md --------- Co-authored-by: Dave Thaler <[email protected]> * Update extracted files (#605) * Stage for v7.0.16 release (#608) --------- 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]>
1 parent f30529a commit 781c7ca

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright 1984-2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
189+
Copyright 1984-2025 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

NOTICE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NOTICE:
22

33
This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™
4-
Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
4+
Specification, © 1984-2025 Intellectual Reserve, Inc. All rights reserved.
55

66
"FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual
77
Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license

changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# main (as of 2025-03-11)
1+
# Version 7.0.16
22

33
- Recommend that `ASSO` not be used to replicate other standard structures.
44

specification/gedcom-0-introduction.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: The FamilySearch GEDCOM Specification
3-
subtitle: 7.0.15
3+
subtitle: 7.0.16
44
55
copyright: |
66
:::{style="page-break-after: always;page-break-before: always;"}
7-
Copyright 1984–2024 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
7+
Copyright 1984–2025 Intellectual Reserve, Inc. All rights reserved. A service provided by The Church of Jesus Christ of Latter-day Saints.
88
99
Licensed under the Apache License, Version 2.0 (the "License");
1010
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ copyright: |
2020
2121
> NOTICE:
2222
>
23-
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2024 Intellectual Reserve, Inc. All rights reserved.
23+
> This work comprises, is based on, or is derived from the FAMILYSEARCH GEDCOM™ Specification, © 1984-2025 Intellectual Reserve, Inc. All rights reserved.
2424
>
2525
> "FAMILYSEARCH GEDCOM™" and "FAMILYSEARCH®" are trademarks of Intellectual Reserve, Inc. and may not be used except as allowed by the Apache 2.0 license that governs this work or as expressly authorized in writing and in advance by Intellectual Reserve, Inc.
2626
:::

0 commit comments

Comments
 (0)