Skip to content

Commit 7691d6d

Browse files
lispafs
authored andcommitted
this version of the changes use 'abstract data model' instead of 'abstract model' and reintroduces 'abstract syntax' where the text concerns syntax.
1 parent fe57505 commit 7691d6d

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

spec/index.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
representing information on the Web.
8080
This document defines an abstract data model
8181
which serves to link all RDF-based languages and specifications.
82-
The abstract model has two key data structures:</p>
82+
The abstract data model has two key data structures:</p>
8383
<ul>
8484
<li>RDF graphs are sets of subject-predicate-object triples,
8585
where the elements may be IRIs, blank nodes, datatyped literals, or triple terms.
@@ -137,7 +137,7 @@ <h2>Introduction</h2>
137137
<section id="data-model">
138138
<h3>Graph-based Abstract Data Model</h3>
139139

140-
<p>The core structure of the abstract model is a set of
140+
<p>The core structure of the abstract data model is a set of
141141
<a data-lt="RDF triple">triples</a>, each consisting of a <a>subject</a>,
142142
a <a>predicate</a> and an <a>object</a>. A set of such triples is called
143143
an <a>RDF graph</a>. An RDF graph can be visualized as a node and
@@ -305,7 +305,7 @@ <h3>RDF Vocabularies and Namespace IRIs</h3>
305305
would be abbreviated as <code>rdf:XMLLiteral</code>.
306306
Note however that such abbreviations are <em>not</em> meant to be processed directly as IRIs,
307307
and are not to be used in syntactic contexts where IRIs are expected.
308-
Note also that [=namespace IRIs=] and [=namespace prefixes=] are not a formal part of the RDF abstract model.
308+
Note also that [=namespace IRIs=] and [=namespace prefixes=] are not a formal part of the RDF abstract data model.
309309
They are merely a syntactic convenience for abbreviating IRIs;
310310
for processing, the actual IRIs are reconstructed by replacing each namespace prefix with the corresponding namespace IRI.
311311
</p>
@@ -400,7 +400,7 @@ <h3>Triple Terms and Reification</h3>
400400
<section id="change-over-time">
401401
<h3>RDF and Change over Time</h3>
402402

403-
<p>The RDF abstract model is <em>atemporal</em>: <a>RDF graphs</a>
403+
<p>The RDF abstract data model is <em>atemporal</em>: <a>RDF graphs</a>
404404
are static snapshots of information.</p>
405405

406406
<p>However, <a>RDF graphs</a> can express information
@@ -595,13 +595,13 @@ <h3>RDF Version Announcement</h3>
595595
</section>
596596

597597
<section id="conformance">
598-
<p>This specification, <em>RDF 1.2 Concepts and Abstract Model</em>,
599-
defines an abstract model and related vocabulary for use in
598+
<p>This specification, <em>RDF 1.2 Concepts and Abstract Data Model</em>,
599+
defines an abstract data model and related vocabulary for use in
600600
other specifications, such as
601601
<a>concrete RDF syntaxes</a>,
602602
API specifications, and query languages.
603603
Implementations cannot directly conform to
604-
<em>RDF 1.2 Concepts and Abstract Model</em>,
604+
<em>RDF 1.2 Concepts and Abstract Data Model</em>,
605605
but can conform to such other specifications that normatively
606606
reference terms defined here.</p>
607607

@@ -847,7 +847,7 @@ <h3>IRIs</h3>
847847
is a <a>string</a> that conforms to the syntax
848848
defined in RFC 3987 [[!RFC3987]].</p>
849849

850-
<p>An IRI in the RDF abstract model
850+
<p>An IRI in the RDF abstract syntax
851851
<!-- this passeage does not discuss abstract syntax. it concerns concrete systax -->
852852
MUST be <a data-cite="RFC3986#section-5">resolved</a> per [[RFC3986]] and
853853
MUST NOT be a <a data-cite="RFC3986#section-4.2">relative reference</a>.
@@ -860,7 +860,7 @@ <h3>IRIs</h3>
860860
<a data-cite="I18N-GLOSSARY#dfn-code-point" class="lint-ignore">Unicode code points</a>,
861861
as in Simple String Comparison in
862862
<a data-cite="rfc3987#section-5.3.1">section 5.3.1</a> of [[!RFC3987]].
863-
(This is done in the abstract model, so the IRIs are resolved
863+
(This is done in the abstract syntax, so the IRIs are resolved
864864
IRIs with no escaping or encoding.)
865865
Further normalization MUST NOT be performed before this comparison. </p>
866866

@@ -878,7 +878,7 @@ <h3>IRIs</h3>
878878
An IRI reference is common usage of an Internationalized Resource Identifier.
879879
An IRI reference refers to either a resolved <a>IRI</a> or <a>relative IRI reference</a>,
880880
as described by the <em>IRI-reference</em> production in <a href="#iri-abnf" class="sectionRef"></a>.
881-
The abstract model uses only fully resolved <a>IRIs</a>.
881+
The abstract syntax uses only fully resolved <a>IRIs</a>.
882882
When IRIs are used in operations that are only
883883
defined for URIs, they must first be converted according to
884884
the mapping defined in
@@ -1009,7 +1009,7 @@ <h4>Representation of Literals</h4>
10091009
<p>Some concrete syntaxes MAY support
10101010
<dfn data-lt="simple literal" class="export">simple literals</dfn> consisting of only a
10111011
<a>lexical form</a> without any <a>datatype IRI</a>, <a>language tag</a>, or <a>base direction</a>.
1012-
Simple literals are syntactic sugar for data model
1012+
Simple literals are syntactic sugar for abstract syntax
10131013
<a>literals</a>
10141014
with the <a>datatype IRI</a>
10151015
<code>http://www.w3.org/2001/XMLSchema#string</code>
@@ -1038,7 +1038,7 @@ <h4>Representation of Literals</h4>
10381038
In RDF 1.1, `"chat"@fr` and `"chat"@FR` represent two distinct terms,
10391039
but implementations may replace either with the other via some form of normalization.
10401040
In RDF 1.2, they represent the exact same literal,
1041-
i.e., the case difference in the concrete syntax does not propagate into the abstract model.
1041+
i.e., the case difference in the concrete syntax does not propagate into the abstract syntax.
10421042
Since many RDF 1.1 implementations do normalize language tags internally, they will not be impacted by this change.
10431043
</aside>
10441044

@@ -1146,7 +1146,7 @@ <h3>Blank Nodes</h3>
11461146
They are always locally scoped to the file or RDF store,
11471147
and are <em>not</em> persistent or portable identifiers
11481148
for blank nodes. Blank node identifiers are <em>not</em>
1149-
part of the RDF abstract model, but are entirely dependent
1149+
part of the RDF abstract data model, but are entirely dependent
11501150
on the concrete syntax or implementation. The syntactic restrictions
11511151
on blank node identifiers, if any, therefore also depend on
11521152
the concrete RDF syntax or implementation. Implementations that handle blank node
@@ -1917,7 +1917,7 @@ <h3>The <code>rdf:JSON</code> Datatype</h3>
19171917
<section id="section-skolemization">
19181918
<h2>Replacing Blank Nodes with IRIs</h2>
19191919

1920-
<p>Blank nodes do not have identifiers in the RDF abstract model. The
1920+
<p>Blank nodes do not have identifiers in the RDF abstract data model. The
19211921
<a>blank node identifiers</a> introduced
19221922
by some concrete syntaxes have only
19231923
local scope and are purely an artifact of the serialization.</p>
@@ -1973,8 +1973,8 @@ <h2>Privacy Considerations</h2>
19731973
<section id="security" class="appendix informative">
19741974
<h2>Security Considerations</h2>
19751975

1976-
<p>The RDF Abstract Model is not used directly for conveying information,
1977-
although concrete serialization forms are specifically intended to do so.</p>
1976+
<p>The RDF Abstract Data Model is not used directly for conveying information.
1977+
Concrete serialization forms are specifically intended to do so.</p>
19781978

19791979
<p>Applications can evaluate given data to infer more assertions or to dereference <a>IRIs</a>,
19801980
invoking the security considerations of the scheme for that IRI.
@@ -2189,7 +2189,7 @@ <h2>Changes between RDF 1.1 and RDF 1.2</h2>
21892189
<li>Improved the use of IRI terminology,
21902190
and added <a href="#iri-abnf" class="sectionRef"></a>.
21912191
This improves the language using <a>relative IRI references</a>
2192-
and clarifies that, in the abstract model, IRIs are resolved,
2192+
and clarifies that, in the abstract syntax, IRIs are resolved,
21932193
avoiding the incorrect use of "absolute IRI".</li>
21942194
<li>Changed reference from DOM4, which was not a recommendation at the time, to [[DOM]],
21952195
making the definitions of <a>rdf:HTML</a> and <a>rdf:XMLLiteral</a> datatypes normative.</li>

0 commit comments

Comments
 (0)