Fix merge conflicts

Author: crandmck

docs/community.md

@@ -47,7 +47,7 @@ These related projects may be of interest, but the CAI team doesn't maintain or
 
 - [**Drupal module**](https://github.com/contentauth/c2pa-drupal): Enables Drupal sites to process and display Content Credentials for supported image types.
 - [**DASH video player**](https://github.com/contentauth/dash.js/tree/c2pa-dash):  DASH video player that displays Content Credentials in browsers for supported media types. This repo/branch is a work-in-progress forked from [dash.js](https://github.com/Dash-Industry-Forum/dash.js), the canonical reference JavaScript implementation for the playback of MPEG DASH. 
-- [**TrustMark**](https://github.com/adobe/trustmark): Open-source Python implementation of watermarking for encoding, decoding and removing image watermarks. You can use TrustMark as part of providing [durable content credentials](durable-cr.md).
+- [**TrustMark**](https://github.com/adobe/trustmark): Open-source Python implementation of watermarking for encoding, decoding and removing image watermarks. You can use TrustMark as part of providing [durable content credentials](durable-cr/index.md).
 - [**C2PA Security Testing Tool**](https://github.com/contentauth/c2pa-attacks): A CLI tool derived from [c2patool](https://github.com/contentauth/c2patool) that performs security testing on a Content Credentials application.  This tool is intended for use by software security professionals.
 
 ## Discussions on Discord

docs/js-sdk/getting-started/overview.mdx

@@ -58,7 +58,7 @@ Because of these requirements, **the library is not supported on any version of
 ![CAI JavaScript library browser support](../../../static/img/caniuse.png)
 
 :::info
-This chart is accurate as of December, 2024. For the most up-to-date browser support information, see [caniuse.com](https://caniuse.com/wasm,webworkers,cryptography,typedarrays,fetch).
+This chart is accurate as of July, 2025. For the most up-to-date browser support information, see [caniuse.com](https://caniuse.com/wasm,webworkers,cryptography,typedarrays,fetch).
 :::
 
 ## Debugging

docs/manifest/examples.mdx

@@ -7,7 +7,7 @@ import CodeBlock from '@theme/CodeBlock';
 
 ## C2PA test files
 
-The C2PA [public-testfiles](https://github.com/c2pa-org/public-testfiles) repository contains numerous examples of asset files with Content Credentials. See https://c2pa.org/public-testfiles/ for links to easily inspect each asset file using Verify using [an asset URL](../verify.mdx#using-an-asset-url) and to the corresponding [manifest report](../c2patool/docs/usage.md#displaying-manifest-data) and [detailed manifest report](../c2patool/docs/usage.md#detailed-manifest-report) from C2PA Tool.
+The C2PA [public-testfiles](https://github.com/c2pa-org/public-testfiles) repository contains numerous examples of asset files with Content Credentials. See https://spec.c2pa.org/public-testfiles/ for links to easily inspect each asset file using Verify using [an asset URL](../verify.mdx#using-an-asset-url) and to the corresponding [manifest report](../c2patool/docs/usage.md#displaying-manifest-data) and [detailed manifest report](../c2patool/docs/usage.md#detailed-manifest-report) from C2PA Tool.
 
 :::note
 The claims on these test files were signed with C2PA Tool's built-in test certificate and key (which is not on the [known certificate list](../trust-list.mdx)). Thus, Verify will display the warning: "The Content Credential issuer couldn’t be recognized. This file may not come from where it claims to."

docs/manifest/json-ref/manifest-def.html

@@ -2,9 +2,8 @@ <h2 class="scroll-target" id="manifestdefinition">ManifestDefinition</h2>
 
 <div class="prop_desc">
   <p>
-    Use a ManifestDefinition to define a manifest and to build a
-    <code class="language-plaintext highlighter-rouge">ManifestStore</code>. A
-    manifest is a collection of ingredients and assertions used to define a
+    Use a ManifestDefinition to define a manifest and to build a manifest store.
+    A manifest is a collection of ingredients and assertions used to define a
     claim that can be signed and embedded into a file.
   </p>
 </div>
@@ -1086,11 +1085,7 @@ <h3 class="scroll-target" id="datasource">DataSource</h3>
       <!-- Description -->
       <td class="manifest-ref-table">
         <div class="prop_desc">
-          <p>
-            A list of [<code class="language-plaintext highlighter-rouge"
-              >Actor</code
-            >]s associated with this source.
-          </p>
+          <p>A list of actors associated with this source.</p>
         </div>
       </td>
 
@@ -1289,9 +1284,12 @@ <h3 class="scroll-target" id="hasheduri">HashedUri</h3>
 <p class="prop_desc">
   A <code class="language-plaintext highlighter-rouge">HashedUri</code> provides
   a reference to content available within the same manifest store. This is
-  described in [§8.3, URI References], of the C2PA Technical Specification.
-  [§8.3, URI References]:
-  https://c2pa.org/specifications/specifications/2.1/specs/C2PA_Specification.html#_uri_references
+  described in
+  <a
+    href="https://c2pa.org/specifications/specifications/2.1/specs/C2PA_Specification.html#_uri_references"
+    >§8.3, URI References</a
+  >
+  of the C2PA Technical Specification.
 </p>
 
 <table class="manifest-ref-table" style="margin-top: 10px">
@@ -1452,15 +1450,8 @@ <h3 class="scroll-target" id="ingredient">Ingredient</h3>
           <p>The active manifest label (if one exists).</p>
 
           <p>
-            If this ingredient has a [<code
-              class="language-plaintext highlighter-rouge"
-              >ManifestStore</code
-            >], this will hold the label of the active
-            <a href="crate::Manifest [`ManifestStore`]: crate::ManifestStore"
-              ><code class="language-plaintext highlighter-rouge"
-                >Manifest</code
-              ></a
-            >.
+            If this ingredient has a manifest store, this is the label of the
+            active manifest.
           </p>
         </div>
       </td>
@@ -1778,13 +1769,8 @@ <h3 class="scroll-target" id="ingredient">Ingredient</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A
-            <a href="crate::ManifestStore"
-              ><code class="language-plaintext highlighter-rouge"
-                >ManifestStore</code
-              ></a
-            >
-            from the source asset extracted as a binary C2PA blob.
+            A manifest store from the source asset extracted as a binary C2PA
+            blob.
           </p>
         </div>
       </td>
@@ -2575,10 +2561,9 @@ <h3 class="scroll-target" id="rangetype">RangeType</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A spatial range, see [<code
-              class="language-plaintext highlighter-rouge"
-              >Shape</code
-            >] for more details.
+            A spatial range. See
+            <a href="#shape"><code class="language-plaintext">Shape</code></a>
+            for more details.
           </p>
         </div>
       </td>
@@ -2589,10 +2574,9 @@ <h3 class="scroll-target" id="rangetype">RangeType</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A temporal range, see [<code
-              class="language-plaintext highlighter-rouge"
-              >Time</code
-            >] for more details.
+            A temporal range. See
+            <a href="#shape"><code class="language-plaintext">Time</code></a>
+            for more details.
           </p>
         </div>
       </td>
@@ -2603,10 +2587,9 @@ <h3 class="scroll-target" id="rangetype">RangeType</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A spatial range, see [<code
-              class="language-plaintext highlighter-rouge"
-              >Frame</code
-            >] for more details.
+            A spatial range. See
+            <a href="#frame"><code class="language-plaintext">Frame</code></a>
+            for more details.
           </p>
         </div>
       </td>
@@ -2617,10 +2600,9 @@ <h3 class="scroll-target" id="rangetype">RangeType</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A textual range, see [<code
-              class="language-plaintext highlighter-rouge"
-              >Text</code
-            >] for more details.
+            A textual range. See
+            <a href="#text"><code class="language-plaintext">Text</code></a> for
+            more details.
           </p>
         </div>
       </td>
@@ -2631,10 +2613,9 @@ <h3 class="scroll-target" id="rangetype">RangeType</h3>
       <td class="manifest-ref-table">
         <div class="prop_desc">
           <p>
-            A range identified by a specific identifier and value, see [<code
-              class="language-plaintext highlighter-rouge"
-              >Item</code
-            >] for more details.
+            A range identified by a specific identifier and value. See
+            <a href="#item"><code class="language-plaintext">Item</code></a> for
+            more details.
           </p>
         </div>
       </td>
@@ -2656,12 +2637,16 @@ <h3 class="scroll-target" id="regionofinterest">RegionOfInterest</h3>
 
 <p class="prop_desc">
   A region of interest within an asset describing the change. This struct can be
-  used from [<code class="language-plaintext highlighter-rouge"
-    >Action::changes</code
-  >][crate::assertions::Action::changes] or [<code
-    class="language-plaintext highlighter-rouge"
-    >Metadata::region_of_interest</code
-  >][crate::assertions::Metadata::region_of_interest].
+  used from
+  <a
+    href="https://docs.rs/c2pa/latest/c2pa/assertions/struct.Action.html#method.changes"
+    ><code class="language-plaintext">Action::changes</code></a
+  >
+  or
+  <a
+    href="https://docs.rs/c2pa/latest/c2pa/assertions/struct.Metadata.html#method.region_of_interest"
+    ><code class="language-plaintext">Metadata::region_of_interest</code></a
+  >
 </p>
 
 <table class="manifest-ref-table" style="margin-top: 10px">
@@ -2950,10 +2935,11 @@ <h3 class="scroll-target" id="resourceref">ResourceRef</h3>
 
 <p class="prop_desc">
   A reference to a resource to be used in JSON serialization. The underlying
-  data can be read as a stream via [<code
-    class="language-plaintext highlighter-rouge"
-    >Reader::resource_to_stream</code
-  >][crate::Reader::resource_to_stream].
+  data can be read as a stream via
+  <a
+    href="https://docs.rs/c2pa/latest/c2pa/struct.Reader.html#method.resource_to_stream"
+    ><code>Reader::resource_to_stream</code> </a
+  >.
 </p>
 
 <table class="manifest-ref-table" style="margin-top: 10px">
@@ -3976,9 +3962,8 @@ <h3 class="scroll-target" id="textselectorrange">TextSelectorRange</h3>
 <p><!-- end of oneOf entity --></p>
 
 <p class="prop_desc">
-  One or two [<code class="language-plaintext highlighter-rouge"
-    >TextSelector</code
-  >][TextSelector] identifiying the range to select.
+  One or two <a href="#textselector">TextSelectors</a> identifiying the range to
+  select.
 </p>
 
 <table class="manifest-ref-table" style="margin-top: 10px">

docs/manifest/reading/ingredients-reading.md

@@ -61,16 +61,16 @@ The ingredient object's `relationship` property describes its relationship to th
 The [ValidationResults](/docs/manifest/json-ref/reader#validationresults) object contains the the validation results for the active manifest and any changes to ingredients.
 
 When ingredients are added, the SDK validates their Content Credentials (if any).  However, the validation status of an ingredient does not imply anything about the validation status of the composed asset containing the ingredient. In other words:
-- A composed asset's Content Credentials may be valid, but one or more of its ingredients may have invalid Content Credentials. For example, test file [adobe-20220124-XCA.jpg](https://contentcredentials.org/verify?source=https://c2pa.org/public-testfiles/image/jpeg/adobe-20220124-XCA.jpg)
-- A composed asset's Content Credentials may be invalid, but one or more of its ingredients may have valid Content Credentials. For example, test file [adobe-20220124-CIE-sig-CA.jpg](https://contentcredentials.org/verify?source=https://c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CIE-sig-CA.jpg). 
+- A composed asset's Content Credentials may be valid, but one or more of its ingredients may have invalid Content Credentials. For example, test file [adobe-20220124-XCA.jpg](https://contentcredentials.org/verify?source=https://spec.c2pa.org/public-testfiles/image/jpeg/adobe-20220124-XCA.jpg)
+- A composed asset's Content Credentials may be invalid, but one or more of its ingredients may have valid Content Credentials. For example, test file [adobe-20220124-CIE-sig-CA.jpg](https://contentcredentials.org/verify?source=https://spec.c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CIE-sig-CA.jpg). 
 
 :::note
 Ingredient certificates are validated when they are added to the manifest store, NOT during validation of the composed asset. 
 :::
 
 ### Example of ingredient with invalid credentials
 
-As noted above, the test file [adobe-20220124-CIE-sig-CA.jpg](https://contentcredentials.org/verify?source=https://c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CIE-sig-CA.jpg) has an ingredient with invalid Content Credentials, as shown in this snippet from the manifest store: 
+As noted above, the test file [adobe-20220124-CIE-sig-CA.jpg](https://contentcredentials.org/verify?source=https://spec.c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CIE-sig-CA.jpg) has an ingredient with invalid Content Credentials, as shown in this snippet from the manifest store: 
 
 ```json
 ...
@@ -109,9 +109,9 @@ As noted above, the test file [adobe-20220124-CIE-sig-CA.jpg](https://contentcre
 
 ## Examples
 
-The [C2PA public-testfiles](https://c2pa.org/public-testfiles/image/) repository has several examples of images with multiple ingredients:
-- [Image with two ingredients](https://contentcredentials.org/verify?source=https://c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CAICA.jpg); [View JSON manifest store](https://c2pa.org/public-testfiles/image/jpeg/manifests/adobe-20220124-CAICA/manifest_store.json)
-- [Image with seven ingredients](https://contentcredentials.org/verify?source=https://c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CAIAIIICAICIICAIICICA.jpg); [View JSON manifest store](https://c2pa.org/public-testfiles/image/jpeg/manifests/adobe-20220124-CAIAIIICAICIICAIICICA/manifest_store.json)
+The [C2PA public-testfiles](https://spec.c2pa.org/public-testfiles/image/) repository has several examples of images with multiple ingredients:
+- [Image with two ingredients](https://contentcredentials.org/verify?source=https://spec.c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CAICA.jpg); [View JSON manifest store](https://spec.c2pa.org/public-testfiles/image/jpeg/manifests/adobe-20220124-CAICA/manifest_store.json)
+- [Image with seven ingredients](https://contentcredentials.org/verify?source=https://spec.c2pa.org/public-testfiles/image/jpeg/adobe-20220124-CAIAIIICAICIICAIICICA.jpg); [View JSON manifest store](https://spec.c2pa.org/public-testfiles/image/jpeg/manifests/adobe-20220124-CAIAIIICAICIICAIICICA/manifest_store.json)