Merge updates from integration into rel/1.0.X (doc links, fields data)

usnistgov · Sep 30, 2020 · bb20054 · bb20054
2 parents 9419d2d + 71d371f
commit bb20054
Show file tree

Hide file tree

Showing 5 changed files with 10,753 additions and 1,475 deletions.
diff --git a/etc/help/nerdm-intro-body.html b/etc/help/nerdm-intro-body.html
@@ -37,8 +37,8 @@ <h2>Introduction</h2>
 However, they can also consult the
 <a href="https://json-schema.org/">JSON Schema</a> definition
 documents useful.  The NERDm schema has two parts: a
-<a href="https://data.nist.gov/od/dm/nerdm-schema/">core schema</a>,
-and an <a href="https://data.nist.gov/od/dm/nerdm-pub-schema/">an
+<a href="/od/dm/nerdm-schema/">core schema</a>,
+and an <a href="/od/dm/nerdm-schema/pub/">an
 extension schema for describing data publications</a>.)
 </p>
 
@@ -50,7 +50,7 @@ <h3>What a NERDm record looks like</h3>
 resource.  The metadata is in the form of a set of <em>properties</em>.  A
 <a href="#def:property" title="definition: property">property</a> is a
 piece of metadata that has a <em>name</em> and a <em>value</em>.  The
-<a href="def:value_type" title="definition: value type">value</a> can
+<a href="#def:type" title="definition: value type">value</a> can
 be a single value (e.g. text, a number, true/false), a list of values,
 or a complex values made up of sub-properties.  
 </p>
@@ -164,9 +164,9 @@ <h3>What kinds of information are in a NERDm record</h3>
 these are captured as part of the <a href="#Component">generic
 <span class="Type reference">Component</span> type</a>.  The most
 common type of component is the
-<a href="#Datafile"><span class="Type reference">DataFile</span>
-type</a>, representing a downloadable file; one of its special
-properties is the <a href="#DataFile.downloadURL">
+<a href="#DataFile"><span class="Type reference">DataFile</span>
+type</a>, representing a downloadable data file; one of its special
+properties is the <a href="#DownloadableFile.downloadURL">
 <span class="property reference">downloadURL</span></a>, indicating
 the URL to use to download the file.  
 </p>
@@ -189,15 +189,15 @@ <h3>What kinds of information are in a NERDm record</h3>
                     {
                         "<a href="#Component.@id" title="The NIST-assigned unique identifier for the component (relative to the resource ID)">@id</a>": "cmps/aggregates/wordfreq.csv",
                         "<a href="#Component.@type" title="The component types this resource qualifies as">@type</a>": [ "nrdp:<a href="#DataFile" title="a downloadable file">DataFile</a>", "dcat:Distribution" ],
-                        "<a href="#Component.filepath" title="a name for the data file reflecting its hierarchical location in the resource data collection">filepath</a>": "cmps/aggregates/wordfreq.csv",
-                        "<a href="#DataFile.downloadURL" title="URL providing direct access to the downloadable data file">downloadURL</a>": "https://data.nist.gov/od/id/pdr01893t/aggregates/wordfreq.csv",
+                        "<a href="#DownloadableFile.filepath" title="a name for the data file reflecting its hierarchical location in the resource data collection">filepath</a>": "cmps/aggregates/wordfreq.csv",
+                        "<a href="#DownloadableFile.downloadURL" title="URL providing direct access to the downloadable data file">downloadURL</a>": "https://data.nist.gov/od/id/pdr01893t/aggregates/wordfreq.csv",
                         "<a href="#Component.title" title="a descriptive title for the component">title</a>": "Word Frequency Data",
-                        "<a href="#DataFile.size" title="the size of the file in bytes">size</a>": "209531"
+                        "<a href="#DownloadableFile.size" title="the size of the file in bytes">size</a>": "209531"
                     },
                     {
                         "<a href="#Resource.@id" title="The NIST-assigned unique identifier for the component (relative to the resource ID)">@id</a>": "cmps/aggregates",
                         "<a href="#Component.@type" title="The component types this resource qualifies as">@type</a>": [ "nrdp:<a href="#Subcollection" title="A collection of files and other collections within the resource">Subcollection</a>" ],
-                        "<a href="#Component.filepath" title="a name for the subcollection reflecting its hierarchical location in the resource data collection">filepath</a>": "cmps/aggregates",
+                        "<a href="#Subcollection.filepath" title="a name for the subcollection reflecting its hierarchical location in the resource data collection">filepath</a>": "cmps/aggregates",
                         "<a href="#Component.title" title="a descriptive title for the component">title</a>": "Aggregate data"
                         "<a href="#Component.description" title="a description of the nature and contents of the component, including the role it plays as part of the resource">description</a>": "This collection contains the computed aggregate data." 
                     }