Skip to content

Commit

Permalink
Merge pull request #63 from c2pa-org/antora-2.1
Browse files Browse the repository at this point in the history 
update with latest bits
  • Loading branch information
@lrosenthol
lrosenthol authored Sep 20, 2024
2 parents 4b892b4 + 3d26960 commit e9bf6c1
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 40 deletions.
72 changes: 36 additions & 36 deletions build/site/sitemap.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,146 +2,146 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://c2pa.org/specifications/specifications/2.1/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.1/softbinding/Decoupled.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.1/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.1/specs/ContentCredentials.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.0/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.0/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/2.0/ux/UX_Recommendations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/ai-ml/ai_ml.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/attestations/attestation.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/decoupled/Decoupled.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/explainer/Explainer.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/guidance/Guidance.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/security/Harms_Modelling.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/security/Security_Considerations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.4/ux/UX_Recommendations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.3/ai-ml/ai_ml.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.3/explainer/Explainer.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.3/guidance/Guidance.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.3/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.3/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.2/explainer/Explainer.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.2/guidance/Guidance.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.2/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.2/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.1/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.1/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.1/ux/UX_Recommendations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/explainer/Explainer.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/guidance/Guidance.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/index.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/security/Harms_Modelling.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/security/Security_Considerations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/specs/C2PA_Specification.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
<url>
<loc>https://c2pa.org/specifications/specifications/1.0/ux/UX_Recommendations.html</loc>
<lastmod>2024-09-20T14:06:53.771Z</lastmod>
<lastmod>2024-09-20T14:34:00.415Z</lastmod>
</url>
</urlset>
11 changes: 9 additions & 2 deletions build/site/specifications/2.1/specs/C2PA_Specification.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5014,7 +5014,10 @@ <h5 id="_by_reference"><a class="anchor" href="#_by_reference"></a>15.5.3.1. By
<div class="sect4">
<h5 id="_by_link_header"><a class="anchor" href="#_by_link_header"></a>15.5.3.2. By <code>Link</code> header</h5>
<div class="paragraph">
<p>If the asset was retrieved via an HTTP connection, the validator should look in the header of the HTTP response for a <code>Link</code> header, as defined in <a href="https://datatracker.ietf.org/doc/html/rfc8288">RFC 8288</a>, containing a parameter of <code>rel=c2pa-manifest</code>. If present, a C2PA Manifest Store can be retrieved from that URI reference. The URI will be a standard <code>http</code> or <code>https</code> URI, but may include the <a href="#_uri_references">JUMBF URI</a> fragment. If the URI includes the <a href="#_uri_references">JUMBF URI</a> fragment, such as https://c2pa.org/image.jpg#jumbf=c2pa/urn:c2pa:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4 it shall be to the active manifest within the C2PA Manifest Store that is embedded in that asset.</p>
<p>If the asset was retrieved via an HTTP connection, the validator should look in the header of the HTTP response for a <code>Link</code> header, as defined in <a href="https://datatracker.ietf.org/doc/html/rfc8288">RFC 8288</a>, containing a parameter of <code>rel=c2pa-manifest</code>. If present, a C2PA Manifest Store can be retrieved from that URI reference. The URI will be a standard <code>http</code> or <code>https</code> URI, such as https://c2pa.org/image.c2pa.</p>
</div>
<div class="paragraph">
<p>It is also possible to use the link relation to refer to the C2PA Manifest Store that is embedded inside an asset through the use of a <a href="#_uri_references">JUMBF URI</a> fragment. The URI would include a <a href="#_uri_references">JUMBF URI</a> fragment, to the C2PA Manifest Store superbox https://c2pa.org/image.jpg#jumbf=c2pa. References to specific C2PA Manifests within the C2PA Manifest Store are not permitted and the validator shall ignore any <code>childlabel</code> portion of the <a href="#_uri_references">JUMBF URI</a> fragment.</p>
</div>
<div class="admonitionblock note">
<table>
Expand Down Expand Up @@ -9843,11 +9846,14 @@ <h4 id="_schema_and_example_8"><a class="anchor" href="#_schema_and_example_8"><
? "metadata": $assertion-metadata-map, ; additional information about the assertion
}

$action-choice /= "c2pa.adjustedColor"
$action-choice /= "c2pa.changedSpeed"
$action-choice /= "c2pa.color_adjustments"
$action-choice /= "c2pa.converted"
$action-choice /= "c2pa.copied"
$action-choice /= "c2pa.created"
$action-choice /= "c2pa.cropped"
$action-choice /= "c2pa.deleted"
$action-choice /= "c2pa.drawing"
$action-choice /= "c2pa.dubbed"
$action-choice /= "c2pa.edited"
Expand All @@ -9868,9 +9874,10 @@ <h4 id="_schema_and_example_8"><a class="anchor" href="#_schema_and_example_8"><
$action-choice /= "c2pa.saved"
$action-choice /= "c2pa.transcoded"
$action-choice /= "c2pa.translated"
$action-choice /= "c2pa.watermarked"
$action-choice /= "c2pa.trimmed"
$action-choice /= "c2pa.unknown"
$action-choice /= "c2pa.version_updated"
$action-choice /= "c2pa.watermarked"
$action-choice /= "font.edited"
$action-choice /= "font.subset"
$action-choice /= "font.createdFromVariableFont"
Expand Down
11 changes: 9 additions & 2 deletions build/site/specifications/2.1/specs/ContentCredentials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4187,7 +4187,10 @@ <h5 id="_by_reference"><a class="anchor" href="#_by_reference"></a>10.5.3.1. By
<div class="sect4">
<h5 id="_by_link_header"><a class="anchor" href="#_by_link_header"></a>10.5.3.2. By <code>Link</code> header</h5>
<div class="paragraph">
<p>If the asset was retrieved via an HTTP connection, the validator should look in the header of the HTTP response for a <code>Link</code> header, as defined in <a href="#RFC8288">[RFC 8288]</a>, containing a parameter of <code>rel=c2pa-manifest</code>. If present, a C2PA Manifest Store can be retrieved from that URI reference. The URI will be a standard <code>http</code> or <code>https</code> URI, but may include the <a href="#_uri_references">JUMBF URI</a> fragment. If the URI includes the <a href="#_uri_references">JUMBF URI</a> fragment, such as https://c2pa.org/image.jpg#jumbf=c2pa/urn:c2pa:F9168C5E-CEB2-4faa-B6BF-329BF39FA1E4 it shall be to the active manifest within the C2PA Manifest Store that is embedded in that asset.</p>
<p>If the asset was retrieved via an HTTP connection, the validator should look in the header of the HTTP response for a <code>Link</code> header, as defined in <a href="#RFC8288">[RFC 8288]</a>, containing a parameter of <code>rel=c2pa-manifest</code>. If present, a C2PA Manifest Store can be retrieved from that URI reference. The URI will be a standard <code>http</code> or <code>https</code> URI, such as https://c2pa.org/image.c2pa.</p>
</div>
<div class="paragraph">
<p>It is also possible to use the link relation to refer to the C2PA Manifest Store that is embedded inside an asset through the use of a <a href="#_uri_references">JUMBF URI</a> fragment. The URI would include a <a href="#_uri_references">JUMBF URI</a> fragment, to the C2PA Manifest Store superbox https://c2pa.org/image.jpg#jumbf=c2pa. References to specific C2PA Manifests within the C2PA Manifest Store are not permitted and the validator shall ignore any <code>childlabel</code> portion of the <a href="#_uri_references">JUMBF URI</a> fragment.</p>
</div>
<div class="admonitionblock note">
<table>
Expand Down Expand Up @@ -8784,11 +8787,14 @@ <h4 id="_schema_and_example_8"><a class="anchor" href="#_schema_and_example_8"><
? "metadata": $assertion-metadata-map, ; additional information about the assertion
}

$action-choice /= "c2pa.adjustedColor"
$action-choice /= "c2pa.changedSpeed"
$action-choice /= "c2pa.color_adjustments"
$action-choice /= "c2pa.converted"
$action-choice /= "c2pa.copied"
$action-choice /= "c2pa.created"
$action-choice /= "c2pa.cropped"
$action-choice /= "c2pa.deleted"
$action-choice /= "c2pa.drawing"
$action-choice /= "c2pa.dubbed"
$action-choice /= "c2pa.edited"
Expand All @@ -8809,9 +8815,10 @@ <h4 id="_schema_and_example_8"><a class="anchor" href="#_schema_and_example_8"><
$action-choice /= "c2pa.saved"
$action-choice /= "c2pa.transcoded"
$action-choice /= "c2pa.translated"
$action-choice /= "c2pa.watermarked"
$action-choice /= "c2pa.trimmed"
$action-choice /= "c2pa.unknown"
$action-choice /= "c2pa.version_updated"
$action-choice /= "c2pa.watermarked"
$action-choice /= "font.edited"
$action-choice /= "font.subset"
$action-choice /= "font.createdFromVariableFont"
Expand Down
Binary file modified build/site/specifications/2.1/specs/_attachments/C2PA_Specification.pdf
View file
Binary file not shown.

0 comments on commit e9bf6c1

Please sign in to comment.