Skip to content

Commit

Permalink
Adding metaschema submodule changes (fixed with merge conflict).
Browse files Browse the repository at this point in the history
  • Loading branch information
@JustKuzya @aj-stein-nist
JustKuzya authored and aj-stein-nist committed Jun 14, 2023
1 parent 97c033d commit 1abab7d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build/metaschema
Submodule metaschema updated 74 files
+1 −1 .github/CONTENTS.md
+1 −1 .github/ISSUE_TEMPLATE/README.md
+0 −1 .github/dependabot.yml
+25 −5 .github/workflows/workflow-generate-website.yml
+1 −2 .github/workflows/workflow-validate-repo-markdown.yml
+1 −1 .github/workflows/workflow-validate-website-content.yml
+9 −6 .gitignore
+1 −1 CODE_OF_CONDUCT.md
+8 −0 build/README.md
+48 −38 build/go.mod
+114 −143 build/go.sum
+0 −1,430 build/package-lock.json
+3 −3 build/pom.xml
+1 −1 build/tools.go
+1,554 −0 package-lock.json
+5 −2 package.json
+25 −3 schema/json/metaschema-datatypes.json
+66 −39 schema/xml/metaschema-datatypes.xsd
+46 −6 schema/xml/metaschema-markup-multiline.xsd
+13 −1 schema/xml/metaschema-prose-base.xsd
+12 −12 schema/xml/metaschema.xsd
+1 −1 test-suite/README.md
+1 −1 test-suite/metaschema-xspec/markdown-types/readme.md
+8 −3 test-suite/schema-generation/allowed-values/allowed-values-basic_test_valid_PASS.json
+20 −5 toolchains/xslt-M4/document/json/object-reference-html.xsl
+33 −10 toolchains/xslt-M4/document/xml/element-reference-html.xsl
+1 −1 toolchains/xslt-M4/schema-gen/make-metaschema-xsd.xsl
+5 −0 website/.browserslistrc
+7 −0 website/.htmltest.yml
+0 −18 website/assets/scss/full-width.scss
+0 −38 website/assets/scss/header.scss
+0 −12 website/assets/scss/uswds-custom.scss
+6 −3 website/config.yaml
+10 −4 website/content/_index.md
+4 −3 website/content/contribute/_index.md
+2 −2 website/content/contribute/contact.md
+16 −36 website/content/specification/_index.md
+171 −0 website/content/specification/computer-example.xml
+0 −51 website/content/specification/concepts/_index.md
+0 −38 website/content/specification/concepts/architecture-mermaid.md
+0 −103 website/content/specification/concepts/terminology.md
+831 −0 website/content/specification/datatypes.md
+92 −0 website/content/specification/def-inst.svg
+ − website/content/specification/def-inst.vsdx
+111 −0 website/content/specification/glossary.md
+136 −0 website/content/specification/im-model.svg
+ − website/content/specification/im-model.vsdx
+161 −0 website/content/specification/information-modeling.md
+91 −0 website/content/specification/mapping.md
+0 −22 website/content/specification/mapping/_index.md
+0 −0 website/content/specification/metaschema-information-elements.png
+60 −0 website/content/specification/overview.md
+349 −276 website/content/specification/syntax/_index.md
+44 −0 website/content/specification/syntax/constraints.md
+0 −705 website/content/specification/syntax/datatypes.md
+580 −0 website/content/specification/syntax/definitions.md
+169 −0 website/content/specification/syntax/inline-definitions.md
+464 −0 website/content/specification/syntax/instances.md
+273 −0 website/content/specification/syntax/module.md
+85 −73 website/content/tutorials/1-getting-started/_index.md
+5 −2 website/content/tutorials/_index.md
+21 −5 website/content/use/_index.md
+0 −7 website/layouts/partials/foot.html
+0 −28 website/layouts/partials/head.html
+11 −0 website/static/css/element-map.css
+0 −0 website/static/img/oscal-gears-icon-140.png
+0 −0 website/static/img/oscal-gears-icon-32.png
+0 −0 website/static/img/oscal-page-icon-180.png
+1 −1 website/themes/uswds
+28 −0 website/themes/uswds-nist/assets/scss/_hugo-uswds-custom-styles.scss
+25 −0 website/themes/uswds-nist/config.yaml
+30 −0 website/themes/uswds-nist/layouts/partials/foot.html
+2 −0 website/themes/uswds-nist/layouts/partials/head.html
+1 −0 website/themes/uswds-nist/layouts/partials/top-banner.html

0 comments on commit 1abab7d

Please sign in to comment.