From c389e45e8e859bdcbc4a83e201381af6e77347d0 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Fri, 24 Oct 2025 16:52:05 +0200
Subject: [PATCH 01/12] update `astro:content` reference for v6

---
 .../en/reference/modules/astro-content.mdx    | 139 +++++++++++-------
 1 file changed, 82 insertions(+), 57 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 1066994323bbd..4c9a4138913fb 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -44,7 +44,7 @@ import {
 <Since v="2.0.0" />
 </p>
 
-`defineCollection()` is a utility to configure a collection in a `src/content.config.*` file.
+A utility to configure a collection in a `src/content.config.*` file.
 
 ```ts title="src/content.config.ts"
 import { z, defineCollection } from 'astro:content';
@@ -73,7 +73,7 @@ This function accepts the following properties:
 <Since v="5.0.0" />
 </p>
 
-A `loader` is either an object or a function that allows you to load data from any source, local or remote, into content collections.
+Either an object or a function that allows you to load data from any source, local or remote, into content collections.
 
 [See the `Content Collection` guide](/en/guides/content-collections/#build-time-collection-loaders) for example usage.
 
@@ -85,7 +85,7 @@ A `loader` is either an object or a function that allows you to load data from a
 <Since v="2.0.0" />
 </p>
 
-`schema` is an optional Zod object to configure the type and shape of document frontmatter for a collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
+An optional Zod object or function that returns a Zod object to configure the type and shape of document frontmatter for a collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
 
 [See the `Content Collection` guide](/en/guides/content-collections/#defining-the-collection-schema) for example usage.
 
@@ -93,20 +93,20 @@ A `loader` is either an object or a function that allows you to load data from a
 
 <p>
 
-**Type:** `(input: CollectionConfig) => CollectionConfig`
+**Type:** `(config: LiveCollectionConfig) => LiveCollectionConfig`
 <Since v="6.0.0" />
 </p>
 
-`defineLiveCollection()` is a utility to configure a live collection in a `src/live.config.*` file.
+A utility to configure a live collection in a `src/live.config.*` file.
 
-```ts title="src/content.config.ts"
+```ts title="src/live.config.ts"
 import { defineLiveCollection } from 'astro:content';
-import { storeLoader } from '@mystore/astro-loader';
+import { storeLoader } from '@example/astro-loader';
 
 const products = defineLiveCollection({
   loader: storeLoader({
     apiKey: process.env.STORE_API_KEY,
-    endpoint: 'https://api.mystore.com/v1',
+    endpoint: 'https://api.example.com/v1',
   }),
 });
 
@@ -121,11 +121,11 @@ This function accepts the following properties:
 
 <p>
 
-**Type:** <code>() => Promise&lt;Array&lt;\{ id: string, [key: string]: any }&gt; | Record&lt;string, Record&lt;string, any&gt;&gt;&gt; | <a href="/en/reference/content-loader-reference/#object-loader-api">Loader</a></code>
-<Since v="5.0.0" />
+**Type:** `LiveLoader`
+<Since v="6.0.0" />
 </p>
 
-A `loader` is either an object or a function that allows you to load data from any source, local or remote, into a live content collections.
+An object that allows you to load data at runtime from a remote source, into a live content collections.
 
 [See the `Content Collection` guide](/en/guides/content-collections/#creating-a-live-loader) for example usage.
 
@@ -137,7 +137,10 @@ A `loader` is either an object or a function that allows you to load data from a
 <Since v="6.0.0" />
 </p>
 
-`schema` is an optional Zod object to configure the type and shape of document frontmatter for a live collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
+An optional Zod object to configure the type and shape of your data for a live collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
+
+{/* TODO: we might want a link here to the reference for building a live loader similar to what we have for build-time collections (ie. https://docs.astro.build/en/reference/content-loader-reference/#object-loader-api) */}
+When you define a schema, it will take precedence over the loader’s types when you query the collection.
 
 [See the `Content Collection` guide](/en/guides/content-collections/#using-zod-schemas-with-live-collections) for example usage.
 
@@ -145,16 +148,15 @@ A `loader` is either an object or a function that allows you to load data from a
 
 <p>
 
-**Type:** `(collection: string) => ZodEffects<ZodString, { collection, id: string }>`<br />
+**Type:** <code>(collection: <a href="#collectionkey">CollectionKey</a>) => ZodEffects\<ZodString, \{ collection: CollectionKey, id: string \}\></code><br />
 <Since v="2.5.0" />
 </p>
 
-The `reference()` function is used in the content config to define a relationship, or "reference," from one collection to another. This accepts a collection name and transforms the reference into an object containing the collection name and the reference id.
-
+A function used in the content config to define a relationship, or "reference", from one collection to another. This accepts a collection name and transforms the reference into an object containing the collection name and the reference id.
 
 This example defines references from a blog author to the `authors` collection and an array of related posts to the same `blog` collection:
 
-```ts
+```ts title="src/content.config.ts"
 import { defineCollection, reference, z } from 'astro:content';
 import { glob, file } from 'astro/loaders';
 
@@ -188,19 +190,19 @@ const relatedPosts = await getEntries(blogPost.data.relatedPosts);
 
 <p>
 
-**Type:** `(collection: string, filter?: (entry: CollectionEntry<collection>) => boolean) => CollectionEntry<collection>[]`
+**Type:** <code>(collection: <a href="#collectionkey">CollectionKey</a>, filter?: (entry: <a href="#collectionentry">CollectionEntry</a>) => boolean) => CollectionEntry[]</code>
 <Since v="2.0.0" />
 </p>
 
-`getCollection()` is a function that retrieves a list of content collection entries by collection name.
+A function that retrieves a list of content collection entries by collection name.
 
 It returns all items in the collection by default, and accepts an optional `filter` function to narrow by entry properties. This allows you to query for only some items in a collection based on `id` or frontmatter values via the `data` object.
 
-```astro
+```astro title="src/pages/blog/index.astro"
 ---
 import { getCollection } from 'astro:content';
 
-// Get all `src/content/blog/` entries
+// Get all `src/data/blog/` entries
 const allBlogPosts = await getCollection('blog');
 
 // Only return posts with `draft: true` in the frontmatter
@@ -216,25 +218,23 @@ const draftBlogPosts = await getCollection('blog', ({ data }) => {
 
 <p>
 
-**Type:** `(collection: string, filter?: (entry: CollectionEntry<collection>) => boolean) => CollectionEntry<collection>[]`
+**Type:** `(collection: string, filter?: LiveLoaderCollectionFilterType) => Promise<LiveDataCollectionResult>`
 <Since v="6.0.0" />
 </p>
 
-`getLiveCollection()` is a function that retrieves a list of live content collection entries by collection name.
+A function that retrieves a list of live content collection entries by collection name.
 
-It returns all items in the collection by default, and accepts an optional `filter` function to narrow by entry properties. This allows you to query for only some items in a collection based on `id` or frontmatter values via the `data` object.
+It returns all items in the default collection and accepts an optional `filter` object whose shape is defined by your loader. This allows you to query for only some items in a collection or retrieve data in a different form, depending on your API's capabilities.
 
-```astro
+```astro title="src/pages/shop/index.astro"
 ---
 import { getLiveCollection } from 'astro:content';
 
-// Get all `src/content/blog/` entries
-const allBlogPosts = await getLiveCollection('blog');
+// Get all `products` entries from your API
+const allProducts = await getLiveCollection('products');
 
-// Only return posts with `draft: true` in the frontmatter
-const draftBlogPosts = await getLiveCollection('blog', ({ data }) => {
-  return data.draft === true;
-});
+// Only return `products` that should be featured
+const featuredProducts = await getLiveCollection('products', { featured: true });
 ---
 ```
 
@@ -245,14 +245,14 @@ const draftBlogPosts = await getLiveCollection('blog', ({ data }) => {
 <p>
 
 **Types:**
-* `(collection: string, id: string) => Promise<CollectionEntry<collection> | undefined>`
-* `({ collection: string, id: string }) => Promise<CollectionEntry<collection> | undefined>`
+* <code>(collection: <a href="#collectionkey">CollectionKey</a>, id: string) => Promise\<<a href="#collectionentry">CollectionEntry</a> | undefined\></code>
+* <code>(\{ collection: <a href="#collectionkey">CollectionKey</a>, id: string \}) => Promise\<<a href="#collectionentry">CollectionEntry</a> | undefined\></code>
 <Since v="2.5.0" />
 </p>
 
-`getEntry()` is a function that retrieves a single collection entry by collection name and the entry `id`. `getEntry()` can also be used to get referenced entries to access the `data` or `body` properties:
+A function that retrieves a single collection entry by collection name and the entry `id`. `getEntry()` can also be used to get referenced entries to access the `data` or `body` properties:
 
-```astro
+```astro title="src/pages/index.astro"
 ---
 import { getEntry } from 'astro:content';
 
@@ -273,24 +273,21 @@ See the `Content Collections` guide for examples of [querying collection entries
 
 <p>
 
-**Types:**
-* `(collection: string, id: string) => Promise<LiveDataEntryResult>`
-* `({ collection: string, filter: LiveLoaderEntryFilterType }) => Promise<LiveDataEntryResult>`
+**Type:** `(collection: string, filter: string | LiveLoaderEntryFilterType) => Promise<LiveDataEntryResult>`
 <Since v="6.0.0" />
 </p>
 
-`getLiveEntry()` is a function that retrieves a single live collection entry by collection name and the entry `id`. `getLiveEntry()` can also be used to get referenced entries to access the `data` or `body` properties:
+A function that retrieves a single live collection entry by collection name and an optional filter either as an `id` string or as a type-safe object.
 
-```astro
+```astro title="src/pages/blog/index.astro"
 ---
 import { getLiveEntry } from 'astro:content';
 
-const enterprisePost = await getLiveEntry('blog', 'enterprise');
-
-const picardProfile = await getLiveEntry('captains', 'picard');
-
-// Get the profile referenced by `data.captain`
-const enterpriseCaptainProfile = await getLiveEntry(enterprisePost.data.captain);
+const liveCollectionsPost = await getLiveEntry('blog', 'using-live-collections');
+const mattDraft = await getLiveEntry('blog', {
+  status: 'draft',
+  author: 'matt',
+});
 ---
 ```
 
@@ -300,13 +297,13 @@ See the `Content Collections` guide for examples of [querying collection entries
 
 <p>
 
-**Type:** `(Array<{ collection: string, id: string }>) => Array<CollectionEntry<collection>>`
+**Type:** <code>(\{ collection: <a href="#collectionkey">CollectionKey</a>, id: string \}[]) => <a href="#collectionentry">CollectionEntry</a>[]</code>
 <Since v="2.5.0" />
 </p>
 
-`getEntries()` is a function that retrieves multiple collection entries from the same collection. This is useful for [returning an array of referenced entries](/en/guides/content-collections/#defining-collection-references) to access their associated `data` and `body` properties.
+A function that retrieves multiple collection entries from the same collection. This is useful for [returning an array of referenced entries](/en/guides/content-collections/#defining-collection-references) to access their associated `data` and `body` properties.
 
-```astro
+```astro title="src/pages/blog/enterprise/index.astro"
 ---
 import { getEntries, getEntry } from 'astro:content';
 
@@ -321,7 +318,7 @@ const enterpriseRelatedPosts = await getEntries(enterprisePost.data.relatedPosts
 
 <p>
 
-**Type:** `(entry: CollectionEntry) => Promise<RenderedEntry>`
+**Type:** <code>(entry: <a href="#collectionentry">CollectionEntry</a>) => Promise\<RenderResult\></code>
 <Since v="5.0.0" />
 </p>
 
@@ -352,8 +349,6 @@ const { Content, headings, remarkPluginFrontmatter } = await render(entry);
 import type {
   CollectionEntry,
   CollectionKey,
-  ContentCollectionKey,
-  DataCollectionKey,
   SchemaContext,
  } from 'astro:content';
 ```
@@ -366,45 +361,75 @@ Query functions including [`getCollection()`](#getcollection), [`getEntry()`](#g
 import type { CollectionEntry } from 'astro:content';
 ```
 
-`CollectionEntry` is a generic type. Use it with the name of the collection you're querying.
+A generic type to use with the name of the collection you're querying to represent a single entry in that collection.
 For example, an entry in your `blog` collection would have the type `CollectionEntry<'blog'>`.
 
 Each `CollectionEntry` is an object with the following values:
 
 #### `id`
 
+<p>
+
 **Type:** `string`
+</p>
 
 A unique ID. Note that all IDs from Astro's built-in `glob()` loader are slugified.
 
 #### `collection`
 
-**Example Type:** `'blog' | 'authors' | ...`
+<p>
+
+**Type:** [`CollectionKey`](#collectionkey)
+</p>
 
 The name of a collection in which entries are located. This is the name used to reference the collection in your schema, and in querying functions.
 
 #### `data`
 
+<p>
+
 **Type:** `CollectionSchema<TCollectionName>`
+</p>
 
 An object of frontmatter properties inferred from your collection schema ([see `defineCollection()` reference](#definecollection)). Defaults to `any` if no schema is configured.
 
 #### `body`
 
+<p>
+
 **Type:** `string`
+</p>
 
 A string containing the raw, uncompiled body of the Markdown or MDX document.
 
+#### `rendered`
+
+<p>
+
+**Type:** `RenderedContent`
+</p>
+
+#### `filePath`
+
+<p>
+
+**Type:** `string`
+</p>
+
 ### `CollectionKey`
 
-<p><Since v="3.1.0" /></p>
+<p>
+
+**Example Type:** `'blog' | 'authors' | ...`<br />
+<Since v="3.1.0" />
+</p>
 
 A string union of all collection names defined in your `src/content.config.*` file. This type can be useful when defining a generic function wrapping the built-in `getCollection()`.
 
-```ts
+```ts title="src/utils/collections.ts"
 import { type CollectionKey, getCollection } from 'astro:content';
 
-async function queryCollection(collection: CollectionKey) {
+export async function queryCollection(collection: CollectionKey) {
   return getCollection(collection, ({ data }) => {
     return data.draft !== true;
   });
@@ -419,7 +444,7 @@ This includes the following property:
 
 - `image` - The `image()` schema helper that allows you [to use local images in Content Collections](/en/guides/images/#images-in-content-collections)
 
-```ts
+```ts title="src/content.config.ts"
 import { defineCollection, z, type SchemaContext } from "astro:content";
 
 export const imageSchema = ({ image }: SchemaContext) =>

From 3d1f02aa08aeaa427524158977e94652c21ec153 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Fri, 24 Oct 2025 19:30:10 +0200
Subject: [PATCH 02/12] add docs for `rendered` and `filePath`

---
 src/content/docs/en/reference/modules/astro-content.mdx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 4c9a4138913fb..f899a9de77158 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -406,16 +406,20 @@ A string containing the raw, uncompiled body of the Markdown or MDX document.
 
 <p>
 
-**Type:** `RenderedContent`
+**Type:** `RenderedContent | undefined`
 </p>
 
+The rendered content of a Markdown or HTML entry from a CMS as stored by your loader.
+
 #### `filePath`
 
 <p>
 
-**Type:** `string`
+**Type:** `string | undefined`
 </p>
 
+The path to an entry relative to your project directory. This value is only available for local entries.
+
 ### `CollectionKey`
 
 <p>

From 736b2963ada0409dc794eda8ba65aa88c72a0706 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Sat, 25 Oct 2025 16:10:14 +0200
Subject: [PATCH 03/12] update a code snippet

---
 src/content/docs/en/reference/modules/astro-content.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index f899a9de77158..0e0d26720f2e1 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -279,11 +279,11 @@ See the `Content Collections` guide for examples of [querying collection entries
 
 A function that retrieves a single live collection entry by collection name and an optional filter either as an `id` string or as a type-safe object.
 
-```astro title="src/pages/blog/index.astro"
+```astro title="src/pages/blog/[id].astro"
 ---
 import { getLiveEntry } from 'astro:content';
 
-const liveCollectionsPost = await getLiveEntry('blog', 'using-live-collections');
+const liveCollectionsPost = await getLiveEntry('blog', Astro.params.id);
 const mattDraft = await getLiveEntry('blog', {
   status: 'draft',
   author: 'matt',

From 18d0c80aa2d5b3c48db6ee70ccdb5f1902f0cb74 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Tue, 28 Oct 2025 13:36:23 +0100
Subject: [PATCH 04/12] clearer description of getLiveCollection

Co-authored-by: Matt Kane <m@mk.gg>
---
 src/content/docs/en/reference/modules/astro-content.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 0e0d26720f2e1..c6e0b45833be8 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -224,7 +224,7 @@ const draftBlogPosts = await getCollection('blog', ({ data }) => {
 
 A function that retrieves a list of live content collection entries by collection name.
 
-It returns all items in the default collection and accepts an optional `filter` object whose shape is defined by your loader. This allows you to query for only some items in a collection or retrieve data in a different form, depending on your API's capabilities.
+It returns all items in the default collection and accepts an optional `filter` object whose shape is defined by the collection's loader. This allows you to query for only some items in a collection or retrieve data in a different form, depending on your API's capabilities.
 
 ```astro title="src/pages/shop/index.astro"
 ---

From ef34c9e0ee6882d0bf480d448bcb24bba9d205b8 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Thu, 30 Oct 2025 12:07:52 +0100
Subject: [PATCH 05/12] clearer description for rendered content

Co-authored-by: Matt Kane <m@mk.gg>
---
 src/content/docs/en/reference/modules/astro-content.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index c6e0b45833be8..433609c4afb71 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -409,7 +409,7 @@ A string containing the raw, uncompiled body of the Markdown or MDX document.
 **Type:** `RenderedContent | undefined`
 </p>
 
-The rendered content of a Markdown or HTML entry from a CMS as stored by your loader.
+The rendered content of an entry as [stored by your loader](en/reference/content-loader-reference/#rendered). For example, this can be the rendered content of a Markdown entry, or HTML from a CMS.
 
 #### `filePath`
 

From 26727f316843e58386fb4394544e147c21c237f8 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Thu, 30 Oct 2025 12:16:40 +0100
Subject: [PATCH 06/12] fix link

---
 src/content/docs/en/reference/modules/astro-content.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 433609c4afb71..0d1d6e34c21e3 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -409,7 +409,7 @@ A string containing the raw, uncompiled body of the Markdown or MDX document.
 **Type:** `RenderedContent | undefined`
 </p>
 
-The rendered content of an entry as [stored by your loader](en/reference/content-loader-reference/#rendered). For example, this can be the rendered content of a Markdown entry, or HTML from a CMS.
+The rendered content of an entry as [stored by your loader](/en/reference/content-loader-reference/#rendered). For example, this can be the rendered content of a Markdown entry, or HTML from a CMS.
 
 #### `filePath`
 

From 0adb1cc6de2c71b232838b4b17c5df4b18a79838 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Thu, 30 Oct 2025 14:59:48 +0100
Subject: [PATCH 07/12] Apply Sarah suggestions

Co-authored-by: Sarah Rainsberger <5098874+sarah11918@users.noreply.github.com>
---
 src/content/docs/en/reference/modules/astro-content.mdx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 0d1d6e34c21e3..d49b55fc8acfc 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -73,7 +73,7 @@ This function accepts the following properties:
 <Since v="5.0.0" />
 </p>
 
-Either an object or a function that allows you to load data from any source, local or remote, into content collections.
+Either an object or a function that allows you to load data from any source, local or remote, into a build-time content collection. (For live collections, see the [live `loader`](#loader-1) property.)
 
 [See the `Content Collection` guide](/en/guides/content-collections/#build-time-collection-loaders) for example usage.
 
@@ -125,7 +125,7 @@ This function accepts the following properties:
 <Since v="6.0.0" />
 </p>
 
-An object that allows you to load data at runtime from a remote source, into a live content collections.
+An object that allows you to load data at runtime from a remote source, into a live content collection. (For build-time collections, see the [build-time `loader`](#loader) property.)
 
 [See the `Content Collection` guide](/en/guides/content-collections/#creating-a-live-loader) for example usage.
 
@@ -224,7 +224,7 @@ const draftBlogPosts = await getCollection('blog', ({ data }) => {
 
 A function that retrieves a list of live content collection entries by collection name.
 
-It returns all items in the default collection and accepts an optional `filter` object whose shape is defined by the collection's loader. This allows you to query for only some items in a collection or retrieve data in a different form, depending on your API's capabilities.
+It returns all items in the collection by default, and accepts an optional `filter` object whose shape is defined by the collection's loader. This allows you to query for only some items in a collection or retrieve data in a different form, depending on your API's capabilities.
 
 ```astro title="src/pages/shop/index.astro"
 ---

From 0f59dd660589ea39e2bfda12058c2809502f1608 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Thu, 30 Oct 2025 15:02:49 +0100
Subject: [PATCH 08/12] add `build-time schema`/`live schema` links

---
 src/content/docs/en/reference/modules/astro-content.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index d49b55fc8acfc..46ae2e40662d0 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -85,7 +85,7 @@ Either an object or a function that allows you to load data from any source, loc
 <Since v="2.0.0" />
 </p>
 
-An optional Zod object or function that returns a Zod object to configure the type and shape of document frontmatter for a collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
+An optional Zod object or function that returns a Zod object to configure the type and shape of document frontmatter for a collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod). (For live collections, see the [live `schema`](#schema-1) property.)
 
 [See the `Content Collection` guide](/en/guides/content-collections/#defining-the-collection-schema) for example usage.
 
@@ -137,7 +137,7 @@ An object that allows you to load data at runtime from a remote source, into a l
 <Since v="6.0.0" />
 </p>
 
-An optional Zod object to configure the type and shape of your data for a live collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod).
+An optional Zod object to configure the type and shape of your data for a live collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod). (For build-time collections, see the [build-time `schema`](#schema) property.)
 
 {/* TODO: we might want a link here to the reference for building a live loader similar to what we have for build-time collections (ie. https://docs.astro.build/en/reference/content-loader-reference/#object-loader-api) */}
 When you define a schema, it will take precedence over the loader’s types when you query the collection.

From 77f624bab03b66e8e2b457942c638fe5e33bebd5 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Fri, 31 Oct 2025 16:46:48 +0100
Subject: [PATCH 09/12] unnecessary commas

Co-authored-by: Yan <61414485+yanthomasdev@users.noreply.github.com>
---
 src/content/docs/en/reference/modules/astro-content.mdx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index 46ae2e40662d0..ee8829ee314df 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -125,7 +125,7 @@ This function accepts the following properties:
 <Since v="6.0.0" />
 </p>
 
-An object that allows you to load data at runtime from a remote source, into a live content collection. (For build-time collections, see the [build-time `loader`](#loader) property.)
+An object that allows you to load data at runtime from a remote source into a live content collection. (For build-time collections, see the [build-time `loader`](#loader) property.)
 
 [See the `Content Collection` guide](/en/guides/content-collections/#creating-a-live-loader) for example usage.
 
@@ -382,7 +382,7 @@ A unique ID. Note that all IDs from Astro's built-in `glob()` loader are slugifi
 **Type:** [`CollectionKey`](#collectionkey)
 </p>
 
-The name of a collection in which entries are located. This is the name used to reference the collection in your schema, and in querying functions.
+The name of a collection in which entries are located. This is the name used to reference the collection in your schema and in querying functions.
 
 #### `data`
 

From a2c3e33d8817229df1b0f0b6e7d2538b510ba14c Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Fri, 31 Oct 2025 17:41:00 +0100
Subject: [PATCH 10/12] add live loader API docs

---
 .../en/reference/content-loader-reference.mdx | 136 +++++++++++++++++-
 .../en/reference/modules/astro-content.mdx    |   3 +-
 2 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/src/content/docs/en/reference/content-loader-reference.mdx b/src/content/docs/en/reference/content-loader-reference.mdx
index f9b934faa653f..76c562ff3c1a1 100644
--- a/src/content/docs/en/reference/content-loader-reference.mdx
+++ b/src/content/docs/en/reference/content-loader-reference.mdx
@@ -5,6 +5,7 @@ sidebar:
 i18nReady: true
 ---
 import Since from '~/components/Since.astro';
+import ReadMore from '~/components/ReadMore.astro';
 
 Astro's  Content Loader API allows you to load your data from any source, local or remote, and interact with Astro's content layer to manage your [content collections](/en/guides/content-collections/).
 
@@ -222,9 +223,78 @@ const blog = defineCollection({
 });  
 ```
 
+### Live loaders
+
+A live loader is an object with two methods: `loadCollection()` and `loadEntry()` that should handle errors gracefully and return either data or an `Error` object.
+
+```ts title="src/article-loader.ts"
+import type { LiveLoader } from 'astro/loaders';
+import { fetchFromCMS } from './cms-client.js';
+
+interface Article {
+  id: string;
+  title: string;
+  content: string;
+  author: string;
+}
+
+export function articleLoader(config: { apiKey: string }): LiveLoader<Article> {
+  return {
+    name: 'article-loader',
+    loadCollection: async ({ filter }) => {
+      try {
+        const articles = await fetchFromCMS({
+          apiKey: config.apiKey,
+          type: 'article',
+          filter,
+        });
+
+        return {
+          entries: articles.map((article) => ({
+            id: article.id,
+            data: article,
+          })),
+        };
+      } catch (error) {
+        return {
+          error: new Error(`Failed to load articles: ${error.message}`),
+        };
+      }
+    },
+    loadEntry: async ({ filter }) => {
+      try {
+        // filter will be { id: "some-id" } when called with a string
+        const article = await fetchFromCMS({
+          apiKey: config.apiKey,
+          type: 'article',
+          id: filter.id,
+        });
+
+        if (!article) {
+          return {
+            error: new Error('Article not found'),
+          };
+        }
+
+        return {
+          id: article.id,
+          data: article,
+        };
+      } catch (error) {
+        return {
+          error: new Error(`Failed to load article: ${error.message}`),
+        };
+      }
+    },
+  };
+}
+```
+
+<ReadMore>[See the `Content Collection` guide](/en/guides/content-collections/#creating-a-live-loader) for more information about creating a live loader and example usage.</ReadMore>
+
 ## Object loader API
 
-The API for [inline loaders](#inline-loaders) is very simple, and is shown above. This section shows the API for defining an object loader.
+The API for [inline loaders](#inline-loaders) is very simple, and is shown above. This section shows the API for defining an [object loader](#object-loaders).
 
 ### The `Loader` object
 
@@ -670,3 +740,67 @@ The format of the `RenderedContent` object is:
 ```
 
 If the entry has Markdown content then you can use the [`renderMarkdown()`](#rendermarkdown) function to generate this object from the Markdown string.
+
+## Live loader API
+
+This section shows the API for defining a [live loader](#live-loaders).
+
+### The `LiveLoader` object
+
+A generic type to provide [type safety in your loader](#type-safety-in-live-loaders). This describes an object and accepts four type parameters to describe, in this order: your data structure, your filters when querying a collection, your filters when querying a single entry, and errors.
+
+This object contains the following properties:
+
+#### `name`
+
+<p>
+
+**Type:** `string`
+</p>
+
+
+A unique name for the loader, used in logs.
+
+#### `loadCollection()`
+
+<p>
+
+**Type:** `(context: LoadCollectionContext<TCollectionFilter>) => Promise<LiveDataCollection<TData> | { error: TError; }>`
+</p>
+
+Defines a method to load a collection of entries. This function receives a [context object](#loadcollectioncontext) containing an optional `filter` property and must return a the data associated to this collection or the errors.
+
+#### `loadEntry()`
+
+<p>
+
+**Type:** `(context: LoadEntryContext<TEntryFilter>) => Promise<LiveDataEntry<TData> | undefined | { error: TError; }>`
+</p>
+
+Defines a method to load a single entry. This function receives a [context object](#loadentrycontext) containing a `filter` property and returns either the data associated to the requested entry, `undefined` when the entry cannot be found, or the errors.
+
+### `LoadCollectionContext`
+
+This object is passed to the [`loadCollection()` method](#loadcollection) of the loader and contains the following properties:
+
+#### `filter`
+
+<p>
+
+**Type:** `Record<string, any>`
+</p>
+
+An object describing the filters supported by your loader.
+
+### `LoadEntryContext`
+
+This object is passed to the [`loadEntry()` method](#loadentry) of the loader and contains the following properties:
+
+#### `filter`
+
+<p>
+
+**Type:** `Record<string, any>`
+</p>
+
+An object describing the filters supported by your loader.
diff --git a/src/content/docs/en/reference/modules/astro-content.mdx b/src/content/docs/en/reference/modules/astro-content.mdx
index ee8829ee314df..535305b245c3e 100644
--- a/src/content/docs/en/reference/modules/astro-content.mdx
+++ b/src/content/docs/en/reference/modules/astro-content.mdx
@@ -139,8 +139,7 @@ An object that allows you to load data at runtime from a remote source into a li
 
 An optional Zod object to configure the type and shape of your data for a live collection. Each value must use [a Zod validator](https://github.com/colinhacks/zod). (For build-time collections, see the [build-time `schema`](#schema) property.)
 
-{/* TODO: we might want a link here to the reference for building a live loader similar to what we have for build-time collections (ie. https://docs.astro.build/en/reference/content-loader-reference/#object-loader-api) */}
-When you define a schema, it will take precedence over the loader’s types when you query the collection.
+When you define a schema, it will take precedence over the [live loader’s types](/en/reference/content-loader-reference/#live-loader-api) when you query the collection.
 
 [See the `Content Collection` guide](/en/guides/content-collections/#using-zod-schemas-with-live-collections) for example usage.
 

From 962897b1a4a676a5521a6ba78c396b3c42f3bcff Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Fri, 31 Oct 2025 17:57:17 +0100
Subject: [PATCH 11/12] fix link, not the same page

---
 src/content/docs/en/reference/content-loader-reference.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/en/reference/content-loader-reference.mdx b/src/content/docs/en/reference/content-loader-reference.mdx
index 76c562ff3c1a1..83b09d186f818 100644
--- a/src/content/docs/en/reference/content-loader-reference.mdx
+++ b/src/content/docs/en/reference/content-loader-reference.mdx
@@ -747,7 +747,7 @@ This section shows the API for defining a [live loader](#live-loaders).
 
 ### The `LiveLoader` object
 
-A generic type to provide [type safety in your loader](#type-safety-in-live-loaders). This describes an object and accepts four type parameters to describe, in this order: your data structure, your filters when querying a collection, your filters when querying a single entry, and errors.
+A generic type to provide [type safety in your loader](/en/guides/content-collections/#type-safety-in-live-loaders). This describes an object and accepts four type parameters to describe, in this order: your data structure, your filters when querying a collection, your filters when querying a single entry, and errors.
 
 This object contains the following properties:
 

From e9f557c103a6dd4cd3282350e8e94d5ea3f7b8d8 Mon Sep 17 00:00:00 2001
From: Armand Philippot <git@armand.philippot.eu>
Date: Mon, 3 Nov 2025 11:48:50 +0100
Subject: [PATCH 12/12] add links from Object loaders to reference

---
 src/content/docs/en/reference/content-loader-reference.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/content/docs/en/reference/content-loader-reference.mdx b/src/content/docs/en/reference/content-loader-reference.mdx
index 83b09d186f818..1b35d7adbeac2 100644
--- a/src/content/docs/en/reference/content-loader-reference.mdx
+++ b/src/content/docs/en/reference/content-loader-reference.mdx
@@ -177,7 +177,7 @@ const countries = defineCollection({
 
 ### Object loaders
 
-A loader is an object with a `load()` method that is called at build time to fetch data and update the data store. It allows entries to be updated incrementally, or for the store to be cleared only when necessary. It can also define a schema for the entries, which can be used to validate the data and generate static types. 
+A loader is an object with a [`load()` method](#load) that is called at build time to fetch data and update the data store. It allows [entries](#dataentry) to be updated incrementally, or for the store to be cleared only when necessary. It can also define a schema for the entries, which can be used to validate the data and generate static types. 
 
 The recommended pattern is to define a function that accepts configuration options and returns the loader object, in the same way that you would normally define an Astro integration or Vite plugin.