From 6f0587b7734eb22922b95a45862384beb1fcfec7 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:21:44 -0400
Subject: [PATCH 01/39] HTML Components section

---
 src/pages/en/core-concepts/astro-components.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index d5508fbfc33a8..4298f9a078e1e 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -486,12 +486,22 @@ Note that this approach skips the JavaScript processing, bundling and optimizati
 Astro detects these JavaScript client-side imports and then builds, optimizes, and adds the JS to the page automatically.
 
 ```astro
+
 // ESM import
 <script>
   import './some-external-script.js';
 </script>
 ```
 
+## HTML Components
+
+Astro supports using `.html` files instead of `.astro` files for components. These can be imported like Astro components, but don't support Astro features. As such:
+- They don't support frontmatter or dynamic expressions.
+- Any `<script>` tags are left unbundled, treated as if they had `is:inline`. 
+- They components can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
+- [Slots](http://localhost:3000/en/core-concepts/astro-components/#slots) work as they do in Astro components. If you'd like to use [`Web Components slots feature`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) instead, add `is:inline` to your `<slot>` element.
+
+You may want to use HTML Components if you're migrating from a site built without a framework, or if you want to ensure that your component has no dynamic features.
 
 ## Next Steps
 

From bac394e9448fe65ce49e11b0111aa40a41ff1de4 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:31:12 -0400
Subject: [PATCH 02/39] supported page files in overview

---
 src/pages/en/core-concepts/astro-pages.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c9a8d031f41d1..c6a7d0b6a57c2 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -9,13 +9,21 @@ i18nReady: true
 
 ### File-based routing
 
-Astro leverages a routing strategy called **file-based routing.** Every `.astro` file in your `src/pages` directory becomes a page or an endpoint on your site based on its file path.
+Astro leverages a routing strategy called **file-based routing.**. Each page file in your `src/pages` directory becomes an endpoint on your site based on its file path.
 
 Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
 
-
 📚 Read more about [Routing in Astro](/en/core-concepts/routing/).
 
+### Supported page files 
+
+Astro supports the following file types in the `src/pages` directory:
+- `.astro`
+- [`.js`/`.ts`](http://localhost:3000/en/core-concepts/astro-pages/#non-html-pages)
+- [`.md`](http://localhost:3000/en/core-concepts/astro-pages/#markdown-pages)
+- `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
+- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components#html-components))
+
 ### Page HTML
 
 Astro Pages must return a full `<html>...</html>` page response, including `<head>` and `<body>`. (`<!doctype html>` is optional, and will be added automatically.)

From eb1a1ebf7686c038c72ea37266ccfa9f0bdbe2f9 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:34:55 -0400
Subject: [PATCH 03/39] add Astro Pages section, as these two subsections don't
 apply to non-.astro pages

---
 src/pages/en/core-concepts/astro-pages.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c6a7d0b6a57c2..de6000d296e88 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -5,7 +5,7 @@ description: An introduction to Astro pages
 i18nReady: true
 ---
 
-**Pages** are a special type of [Astro component](/en/core-concepts/astro-components/) that live in the `src/pages/` subdirectory. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
+**Pages** are special files that live in the `src/pages/` subdirectory. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
 
 ### File-based routing
 
@@ -18,12 +18,17 @@ Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/We
 ### Supported page files 
 
 Astro supports the following file types in the `src/pages` directory:
-- `.astro`
-- [`.js`/`.ts`](http://localhost:3000/en/core-concepts/astro-pages/#non-html-pages)
-- [`.md`](http://localhost:3000/en/core-concepts/astro-pages/#markdown-pages)
+- [`.astro`](#astro-pages)
+- [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
+- [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
 - `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components#html-components))
 
+
+## Astro Pages
+
+Astro pages use the `.astro` file extension and support the same features as [Astro components](/en/core-concepts/astro-components).
+
 ### Page HTML
 
 Astro Pages must return a full `<html>...</html>` page response, including `<head>` and `<body>`. (`<!doctype html>` is optional, and will be added automatically.)
@@ -62,8 +67,6 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 Note that using a `<head>` tag works like any other HTML tag: it does not get moved to the top of the page. We recommend writing `<head>` and its contents in your top-level layout.
 
-
-
 ## Markdown Pages
 
 Astro also treats any Markdown (`.md`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.

From d2eca1be8f063a7ef239746971b7d004ef8d9daf Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:37:03 -0400
Subject: [PATCH 04/39] links and other fixes

---
 src/pages/en/core-concepts/astro-components.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index 4298f9a078e1e..718c08b68facb 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -498,8 +498,8 @@ Astro detects these JavaScript client-side imports and then builds, optimizes, a
 Astro supports using `.html` files instead of `.astro` files for components. These can be imported like Astro components, but don't support Astro features. As such:
 - They don't support frontmatter or dynamic expressions.
 - Any `<script>` tags are left unbundled, treated as if they had `is:inline`. 
-- They components can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
-- [Slots](http://localhost:3000/en/core-concepts/astro-components/#slots) work as they do in Astro components. If you'd like to use [`Web Components slots feature`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) instead, add `is:inline` to your `<slot>` element.
+- They can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
+- [Slots](/en/core-concepts/astro-components/#slots) work as they do in Astro components. If you'd like to use [`Web Components slots feature`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) instead, add `is:inline` to your `<slot>` element.
 
 You may want to use HTML Components if you're migrating from a site built without a framework, or if you want to ensure that your component has no dynamic features.
 

From d82fcfc0bec3d779b4b6f06bca86340e6d1bcea4 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:41:06 -0400
Subject: [PATCH 05/39] mention server-side imports

---
 src/pages/en/core-concepts/astro-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index 718c08b68facb..bf9eea3bb7c1f 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -496,7 +496,7 @@ Astro detects these JavaScript client-side imports and then builds, optimizes, a
 ## HTML Components
 
 Astro supports using `.html` files instead of `.astro` files for components. These can be imported like Astro components, but don't support Astro features. As such:
-- They don't support frontmatter or dynamic expressions.
+- They don't support frontmatter, server-side imports, or dynamic expressions.
 - Any `<script>` tags are left unbundled, treated as if they had `is:inline`. 
 - They can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
 - [Slots](/en/core-concepts/astro-components/#slots) work as they do in Astro components. If you'd like to use [`Web Components slots feature`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) instead, add `is:inline` to your `<slot>` element.

From 9a27e15cb3a09db7790139d7b8ab2c0858b20a69 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 15:46:24 -0400
Subject: [PATCH 06/39] satisfy link checker

---
 src/pages/en/core-concepts/astro-pages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index de6000d296e88..4c3f3fc71dd95 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -22,12 +22,12 @@ Astro supports the following file types in the `src/pages` directory:
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
-- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components#html-components))
+- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components#html-components/))
 
 
 ## Astro Pages
 
-Astro pages use the `.astro` file extension and support the same features as [Astro components](/en/core-concepts/astro-components).
+Astro pages use the `.astro` file extension and support the same features as [Astro components](/en/core-concepts/astro-components/).
 
 ### Page HTML
 

From 929e19ed35b37f4c152102ad46ec89987cb35cb6 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Mon, 12 Sep 2022 16:01:47 -0400
Subject: [PATCH 07/39] actually satisfy link checker?

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 4c3f3fc71dd95..9de793a474441 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -22,7 +22,7 @@ Astro supports the following file types in the `src/pages` directory:
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
-- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components#html-components/))
+- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components/#html-components))
 
 
 ## Astro Pages

From b1c4475089f115baa7c94bc03e574e796f4acbfe Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:30:22 -0400
Subject: [PATCH 08/39] Update src/pages/en/core-concepts/astro-components.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-components.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index bf9eea3bb7c1f..44a439749e29c 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -495,13 +495,16 @@ Astro detects these JavaScript client-side imports and then builds, optimizes, a
 
 ## HTML Components
 
-Astro supports using `.html` files instead of `.astro` files for components. These can be imported like Astro components, but don't support Astro features. As such:
+Astro supports importing and using `.html` files as components or placing these files within the `src/pages` subdirectory as pages. You may want to use HTML components if you're reusing code from an existing site built without a framework, or if you want to ensure that your component has no dynamic features.
+
+HTML components must contain only valid HTML, and therefore lack key Astro component features:
 - They don't support frontmatter, server-side imports, or dynamic expressions.
 - Any `<script>` tags are left unbundled, treated as if they had `is:inline`. 
 - They can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
-- [Slots](/en/core-concepts/astro-components/#slots) work as they do in Astro components. If you'd like to use [`Web Components slots feature`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) instead, add `is:inline` to your `<slot>` element.
 
-You may want to use HTML Components if you're migrating from a site built without a framework, or if you want to ensure that your component has no dynamic features.
+:::note
+A [`<slot />` element](/en/core-concepts/astro-components/#slots) inside an HTML component will work as it does in Astro component. In order to use the [HTML Web Component Slot](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) element instead, add `is:inline` to your `<slot>` element.
+:::
 
 ## Next Steps
 

From 43f13cb947585d6ea37deef4cb6b03b7965211c3 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:30:48 -0400
Subject: [PATCH 09/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 9de793a474441..04d1b79f42245 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -22,7 +22,7 @@ Astro supports the following file types in the `src/pages` directory:
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
-- `.html` (following the same restrictions as [HTML Components](/en/core-concepts/astro-components/#html-components))
+- [`.html`](/en/core-concepts/astro-components/#html-components)
 
 
 ## Astro Pages

From 3db624066e5f6d4d7d044f59b32b6a336dbefa42 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:30:55 -0400
Subject: [PATCH 10/39] Update src/pages/en/core-concepts/astro-components.md

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---
 src/pages/en/core-concepts/astro-components.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index 44a439749e29c..b4a82f38e9418 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -486,7 +486,6 @@ Note that this approach skips the JavaScript processing, bundling and optimizati
 Astro detects these JavaScript client-side imports and then builds, optimizes, and adds the JS to the page automatically.
 
 ```astro
-
 // ESM import
 <script>
   import './some-external-script.js';

From 711140ea88321620ab91479fc62868fab18da5c7 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:31:57 -0400
Subject: [PATCH 11/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 04d1b79f42245..8efdd23bf3e8c 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -5,7 +5,7 @@ description: An introduction to Astro pages
 i18nReady: true
 ---
 
-**Pages** are special files that live in the `src/pages/` subdirectory. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
+**Pages** are files that live in the `src/pages/` subdirectory of your Astro project. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
 
 ### File-based routing
 

From dd027bd6d314991275544f042eaee13ce55b7d85 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:34:19 -0400
Subject: [PATCH 12/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Chris Swithinbank <swithinbank@gmail.com>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 8efdd23bf3e8c..3d472f6c2a60a 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -17,7 +17,7 @@ Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/We
 
 ### Supported page files 
 
-Astro supports the following file types in the `src/pages` directory:
+Astro supports the following file types in the `src/pages/` directory:
 - [`.astro`](#astro-pages)
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))

From 4efc6658a13d73065c38de36c0076091e5593357 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 10:34:31 -0400
Subject: [PATCH 13/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 3d472f6c2a60a..01e28dfef7693 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -7,7 +7,7 @@ i18nReady: true
 
 **Pages** are files that live in the `src/pages/` subdirectory of your Astro project. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
 
-### File-based routing
+## File-based routing
 
 Astro leverages a routing strategy called **file-based routing.**. Each page file in your `src/pages` directory becomes an endpoint on your site based on its file path.
 

From 72ec63f62cc3a3cfffd1f1b04fd17dd3d68834b8 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 11:03:56 -0400
Subject: [PATCH 14/39] make overview subheadings top-level

---
 src/pages/en/core-concepts/astro-pages.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 01e28dfef7693..f57fd9a2c3201 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -15,22 +15,20 @@ Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/We
 
 📚 Read more about [Routing in Astro](/en/core-concepts/routing/).
 
-### Supported page files 
+## Supported page files 
 
 Astro supports the following file types in the `src/pages/` directory:
 - [`.astro`](#astro-pages)
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
-- [`.html`](/en/core-concepts/astro-components/#html-components)
+- [`.html`](#html-components)
 
 
 ## Astro Pages
 
 Astro pages use the `.astro` file extension and support the same features as [Astro components](/en/core-concepts/astro-components/).
 
-### Page HTML
-
 Astro Pages must return a full `<html>...</html>` page response, including `<head>` and `<body>`. (`<!doctype html>` is optional, and will be added automatically.)
 
 ```astro

From a62e58e74b6d2acbe8c275e68b717d6d854aeac1 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 11:19:17 -0400
Subject: [PATCH 15/39] non-html pages -> file routes

---
 src/pages/en/core-concepts/astro-pages.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index f57fd9a2c3201..d27f229a4916d 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -21,7 +21,7 @@ Astro supports the following file types in the `src/pages/` directory:
 - [`.astro`](#astro-pages)
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
-- [`.js`/`.ts`](/en/core-concepts/astro-pages/#non-html-pages)
+- [`.js`/`.ts`](#file-routes)
 - [`.html`](#html-components)
 
 
@@ -85,11 +85,9 @@ This is my page, written in **Markdown.**
 📚 Read more about [Markdown](/en/guides/markdown-content/) in Astro.
 
 
-## Non-HTML Pages
+## File Routes
 
-Non-HTML pages, like `.json` or `.xml`, or even assets such as images, can be built using API routes commonly referred to as **File Routes**.
-
-**File Routes** are script files that end with the `.js` or `.ts` extension and are located within the `src/pages/` directory.
+**File Routes** are script files that end with the `.js` or `.ts` extension and are located within the `src/pages/` directory. These can build non-HTML pages, like .json or .xml, or even assets such as images.
 
 Built filenames and extensions are based on the source file's name, ex: `src/pages/data.json.ts` will be built to match the `/data.json` route in your final build.
 
@@ -111,7 +109,7 @@ export async function get() {
 }
 ```
 
-API Routes receive an `APIContext` object which contains [params](/en/reference/api-reference/#params) and a [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request):
+As API Routes, File Routes receive an `APIContext` object which contains [params](/en/reference/api-reference/#params) and a [Request](https://developer.mozilla.org/en-US/docs/Web/API/Request):
 
 ```ts title="src/pages/request-path.json.ts"
 import type { APIContext } from 'astro';

From b1f57be24289946edab7e7dbd0d41493767db9b3 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 11:44:35 -0400
Subject: [PATCH 16/39] remove SSR mode differentiator

---
 src/pages/en/core-concepts/astro-pages.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index d27f229a4916d..ac7007c2708e6 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -91,8 +91,6 @@ This is my page, written in **Markdown.**
 
 Built filenames and extensions are based on the source file's name, ex: `src/pages/data.json.ts` will be built to match the `/data.json` route in your final build.
 
-In SSR (server-side rendering) the extension does not matter and can be omitted. This is because no files are generated at build time. Instead, Astro generates a single server file.
-
 ```js
 // Example: src/pages/builtwith.json.ts
 // Outputs: /builtwith.json

From c4c6673819ae992b48291222034c00f757495f06 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 11:50:02 -0400
Subject: [PATCH 17/39] html pages stub

---
 src/pages/en/core-concepts/astro-pages.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index ac7007c2708e6..88c75ab660e5f 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -22,7 +22,7 @@ Astro supports the following file types in the `src/pages/` directory:
 - [`.md`](#markdown-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](#file-routes)
-- [`.html`](#html-components)
+- [`.html`](#html-pages)
 
 
 ## Astro Pages
@@ -150,6 +150,11 @@ export const get: APIRoute = ({ params, request }) => {
 
 ```
 
+## HTML Pages
+
+You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
+
+
 ## Custom 404 Error Page
 
 For a custom 404 error page, you can create a `404.astro` or `404.md` file in `/src/pages`.

From eea885965674417722bc472d0da0713483282d5e Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 12:01:11 -0400
Subject: [PATCH 18/39] satisfy link checker

---
 src/pages/en/guides/markdown-content.md          | 2 +-
 src/pages/en/guides/rss.md                       | 2 +-
 src/pages/en/reference/integrations-reference.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/en/guides/markdown-content.md b/src/pages/en/guides/markdown-content.md
index eed3cb8582563..7b06e3bd5e452 100644
--- a/src/pages/en/guides/markdown-content.md
+++ b/src/pages/en/guides/markdown-content.md
@@ -585,6 +585,6 @@ When using Prism, you'll need to add a stylesheet to your project for syntax hig
 1. [Setting `syntaxHighlight: 'prism'`](#choose-a-syntax-highlighter) from your `@astrojs/markdown-remark` config.
 1. Choosing a premade stylesheet from the available [Prism Themes](https://github.com/PrismJS/prism-themes).
 2. Adding this stylesheet to [your project's `public/` directory](/en/core-concepts/project-structure/#public).
-3. Loading this [into your page's `<head>`](/en/core-concepts/astro-pages/#page-html) via a `<link>` tag.
+3. Loading this [into your page's `<head>`](/en/core-concepts/astro-pages/#modiying-head) via a `<link>` tag.
 
 You can also visit the [list of languages supported by Prism](https://prismjs.com/#supported-languages) for options and usage.
diff --git a/src/pages/en/guides/rss.md b/src/pages/en/guides/rss.md
index d1297c40fb2d1..a858e7f1e7ca0 100644
--- a/src/pages/en/guides/rss.md
+++ b/src/pages/en/guides/rss.md
@@ -10,7 +10,7 @@ Astro supports fast, automatic RSS feed generation for blogs and other content w
 
 ## Setting up `@astrojs/rss`
 
-The `@astrojs/rss` package provides helpers for generating RSS feeds using [API endpoints](/en/core-concepts/astro-pages/#non-html-pages). This unlocks both static builds _and_ on-demand generation when using an [SSR adapter](/en/guides/server-side-rendering/#enabling-ssr-in-your-project).
+The `@astrojs/rss` package provides helpers for generating RSS feeds using [API endpoints](/en/core-concepts/astro-pages/#file-routes). This unlocks both static builds _and_ on-demand generation when using an [SSR adapter](/en/guides/server-side-rendering/#enabling-ssr-in-your-project).
 
 First, install `@astrojs/rss` using your preferred package manager:
 
diff --git a/src/pages/en/reference/integrations-reference.md b/src/pages/en/reference/integrations-reference.md
index 5b48eb17682d1..a408b344ed6a2 100644
--- a/src/pages/en/reference/integrations-reference.md
+++ b/src/pages/en/reference/integrations-reference.md
@@ -119,7 +119,7 @@ A callback function to add a component framework renderer (i.e. React, Vue, Svel
 
 **Type:** `({ pattern: string, entryPoint: string }) => void;`
 
-A callback function to inject routes into an Astro project. Injected routes can be [`.astro` pages](/en/core-concepts/astro-pages/) or [`.js` and `.ts` route handlers](/en/core-concepts/astro-pages/#non-html-pages).
+A callback function to inject routes into an Astro project. Injected routes can be [`.astro` pages](/en/core-concepts/astro-pages/) or [`.js` and `.ts` route handlers](/en/core-concepts/astro-pages/#file-routes).
 
 `injectRoute` takes an object with a `pattern` and an `entryPoint`.
 

From 755c8022ddec8828d8e181fd9fe88ac8c8e22255 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 12:57:31 -0400
Subject: [PATCH 19/39] remove layout section

---
 src/pages/en/core-concepts/astro-pages.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 88c75ab660e5f..96749079726d8 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -45,8 +45,6 @@ Astro Pages must return a full `<html>...</html>` page response, including `<hea
 </html>
 ```
 
-### Leveraging Page Layouts
-
 To avoid repeating the same HTML elements on every page, you can move common `<head>` and `<body>` elements into your own [layout components](/en/core-concepts/layouts/). You can use as many or as few layout components as you'd like.
 
 ```astro {3} /</?MySiteLayout>/
@@ -61,7 +59,7 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 📚 Read more about [layout components](/en/core-concepts/layouts/) in Astro.
 
-#### Modifying `<head>`
+### Modifying `<head>`
 
 Note that using a `<head>` tag works like any other HTML tag: it does not get moved to the top of the page. We recommend writing `<head>` and its contents in your top-level layout.
 

From cc32b5712290b2a6fc732117f16620948700860d Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 12:58:00 -0400
Subject: [PATCH 20/39] remove 'HTML' in overview

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 96749079726d8..c2681e606f357 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -5,7 +5,7 @@ description: An introduction to Astro pages
 i18nReady: true
 ---
 
-**Pages** are files that live in the `src/pages/` subdirectory of your Astro project. They are responsible for handling routing, data loading, and overall page layout for every HTML page in your website.
+**Pages** are files that live in the `src/pages/` subdirectory of your Astro project. They are responsible for handling routing, data loading, and overall page layout for every page in your website.
 
 ## File-based routing
 

From 04bd6797be3cb2d6bf3765c8522d8504fe5973b3 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:07:02 -0400
Subject: [PATCH 21/39] move head section to troubleshooting

---
 src/pages/en/core-concepts/astro-pages.md | 4 ----
 src/pages/en/guides/troubleshooting.md    | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c2681e606f357..b776d5a77e64c 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -59,10 +59,6 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 📚 Read more about [layout components](/en/core-concepts/layouts/) in Astro.
 
-### Modifying `<head>`
-
-Note that using a `<head>` tag works like any other HTML tag: it does not get moved to the top of the page. We recommend writing `<head>` and its contents in your top-level layout.
-
 ## Markdown Pages
 
 Astro also treats any Markdown (`.md`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.
diff --git a/src/pages/en/guides/troubleshooting.md b/src/pages/en/guides/troubleshooting.md
index 7e3508f8b34aa..b780e97e54fda 100644
--- a/src/pages/en/guides/troubleshooting.md
+++ b/src/pages/en/guides/troubleshooting.md
@@ -127,6 +127,10 @@ Yarn 2+, a.k.a. Berry, uses a technique called [Plug'n'Play (PnP)](https://yarnp
 nodeLinker: "node-modules"
 ```
 
+### Using `<head>` in a component
+
+In Astro, using a `<head>` tag works like any other HTML tag: it does not get moved to the top of the page or merged with the existing `<head>`. Because of this, you usually only want to include one `<head>` tag throughout a page. We recommend writing that single `<head>` and its contents in a [layout component](/en/core-concepts/layouts/).
+
 ## Tips and tricks
 
 ### Debugging with `console.log()`

From 42c5ae7684c881d96f39c3cd80770f432b878c2e Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:14:29 -0400
Subject: [PATCH 22/39] remove confusing/out of date disclaimer

---
 src/pages/en/core-concepts/astro-pages.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index b776d5a77e64c..c65d5ffdc8d41 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -29,8 +29,6 @@ Astro supports the following file types in the `src/pages/` directory:
 
 Astro pages use the `.astro` file extension and support the same features as [Astro components](/en/core-concepts/astro-components/).
 
-Astro Pages must return a full `<html>...</html>` page response, including `<head>` and `<body>`. (`<!doctype html>` is optional, and will be added automatically.)
-
 ```astro
 ---
 // Example: src/pages/index.astro
@@ -148,6 +146,7 @@ export const get: APIRoute = ({ params, request }) => {
 
 You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
 
+Like Astro pages, these must return a full `<html>...</html>` page response.
 
 ## Custom 404 Error Page
 

From a7d82e25c5e93c58fb43cd4c3b2dcbfcc09e3eb0 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:23:30 -0400
Subject: [PATCH 23/39] fix english link

---
 src/pages/en/core-concepts/astro-pages.md | 2 --
 src/pages/en/guides/markdown-content.md   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c65d5ffdc8d41..27769a501b843 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -146,8 +146,6 @@ export const get: APIRoute = ({ params, request }) => {
 
 You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
 
-Like Astro pages, these must return a full `<html>...</html>` page response.
-
 ## Custom 404 Error Page
 
 For a custom 404 error page, you can create a `404.astro` or `404.md` file in `/src/pages`.
diff --git a/src/pages/en/guides/markdown-content.md b/src/pages/en/guides/markdown-content.md
index 7b06e3bd5e452..2135227287b58 100644
--- a/src/pages/en/guides/markdown-content.md
+++ b/src/pages/en/guides/markdown-content.md
@@ -585,6 +585,6 @@ When using Prism, you'll need to add a stylesheet to your project for syntax hig
 1. [Setting `syntaxHighlight: 'prism'`](#choose-a-syntax-highlighter) from your `@astrojs/markdown-remark` config.
 1. Choosing a premade stylesheet from the available [Prism Themes](https://github.com/PrismJS/prism-themes).
 2. Adding this stylesheet to [your project's `public/` directory](/en/core-concepts/project-structure/#public).
-3. Loading this [into your page's `<head>`](/en/core-concepts/astro-pages/#modiying-head) via a `<link>` tag.
+3. Loading this [into your page's `<head>`](/en/guides/troubleshooting/#using-head-in-a-component) via a `<link>` tag.
 
 You can also visit the [list of languages supported by Prism](https://prismjs.com/#supported-languages) for options and usage.

From 2c4273fbdc87a17f4f3d066dc1f6dcafcf414594 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:24:04 -0400
Subject: [PATCH 24/39] Revert "fix english link"

This reverts commit a7d82e25c5e93c58fb43cd4c3b2dcbfcc09e3eb0.
---
 src/pages/en/core-concepts/astro-pages.md | 2 ++
 src/pages/en/guides/markdown-content.md   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 27769a501b843..c65d5ffdc8d41 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -146,6 +146,8 @@ export const get: APIRoute = ({ params, request }) => {
 
 You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
 
+Like Astro pages, these must return a full `<html>...</html>` page response.
+
 ## Custom 404 Error Page
 
 For a custom 404 error page, you can create a `404.astro` or `404.md` file in `/src/pages`.
diff --git a/src/pages/en/guides/markdown-content.md b/src/pages/en/guides/markdown-content.md
index 2135227287b58..7b06e3bd5e452 100644
--- a/src/pages/en/guides/markdown-content.md
+++ b/src/pages/en/guides/markdown-content.md
@@ -585,6 +585,6 @@ When using Prism, you'll need to add a stylesheet to your project for syntax hig
 1. [Setting `syntaxHighlight: 'prism'`](#choose-a-syntax-highlighter) from your `@astrojs/markdown-remark` config.
 1. Choosing a premade stylesheet from the available [Prism Themes](https://github.com/PrismJS/prism-themes).
 2. Adding this stylesheet to [your project's `public/` directory](/en/core-concepts/project-structure/#public).
-3. Loading this [into your page's `<head>`](/en/guides/troubleshooting/#using-head-in-a-component) via a `<link>` tag.
+3. Loading this [into your page's `<head>`](/en/core-concepts/astro-pages/#modiying-head) via a `<link>` tag.
 
 You can also visit the [list of languages supported by Prism](https://prismjs.com/#supported-languages) for options and usage.

From 0680fcbc6cd6f618e64a1cc47eca0103b1b00a85 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:25:27 -0400
Subject: [PATCH 25/39] remove .html disclaimer and fix english link

---
 src/pages/en/core-concepts/astro-pages.md | 2 --
 src/pages/en/guides/markdown-content.md   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c65d5ffdc8d41..27769a501b843 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -146,8 +146,6 @@ export const get: APIRoute = ({ params, request }) => {
 
 You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
 
-Like Astro pages, these must return a full `<html>...</html>` page response.
-
 ## Custom 404 Error Page
 
 For a custom 404 error page, you can create a `404.astro` or `404.md` file in `/src/pages`.
diff --git a/src/pages/en/guides/markdown-content.md b/src/pages/en/guides/markdown-content.md
index 7b06e3bd5e452..2135227287b58 100644
--- a/src/pages/en/guides/markdown-content.md
+++ b/src/pages/en/guides/markdown-content.md
@@ -585,6 +585,6 @@ When using Prism, you'll need to add a stylesheet to your project for syntax hig
 1. [Setting `syntaxHighlight: 'prism'`](#choose-a-syntax-highlighter) from your `@astrojs/markdown-remark` config.
 1. Choosing a premade stylesheet from the available [Prism Themes](https://github.com/PrismJS/prism-themes).
 2. Adding this stylesheet to [your project's `public/` directory](/en/core-concepts/project-structure/#public).
-3. Loading this [into your page's `<head>`](/en/core-concepts/astro-pages/#modiying-head) via a `<link>` tag.
+3. Loading this [into your page's `<head>`](/en/guides/troubleshooting/#using-head-in-a-component) via a `<link>` tag.
 
 You can also visit the [list of languages supported by Prism](https://prismjs.com/#supported-languages) for options and usage.

From 945583704c93228052ba01921ca0fa2739b437a7 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:28:55 -0400
Subject: [PATCH 26/39] swapping 'supported page files' and
 'file-based-routing'

---
 src/pages/en/core-concepts/astro-pages.md | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 27769a501b843..3a08dceda576d 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -7,14 +7,6 @@ i18nReady: true
 
 **Pages** are files that live in the `src/pages/` subdirectory of your Astro project. They are responsible for handling routing, data loading, and overall page layout for every page in your website.
 
-## File-based routing
-
-Astro leverages a routing strategy called **file-based routing.**. Each page file in your `src/pages` directory becomes an endpoint on your site based on its file path.
-
-Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
-
-📚 Read more about [Routing in Astro](/en/core-concepts/routing/).
-
 ## Supported page files 
 
 Astro supports the following file types in the `src/pages/` directory:
@@ -24,6 +16,13 @@ Astro supports the following file types in the `src/pages/` directory:
 - [`.js`/`.ts`](#file-routes)
 - [`.html`](#html-pages)
 
+## File-based routing
+
+Astro leverages a routing strategy called **file-based routing.**. Each page file in your `src/pages` directory becomes an endpoint on your site based on its file path.
+
+Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
+
+📚 Read more about [Routing in Astro](/en/core-concepts/routing/).
 
 ## Astro Pages
 

From fa30e3eebedafbfbfc724a8a7c62af024c5e25d2 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:29:24 -0400
Subject: [PATCH 27/39] 'page file' -> 'file'

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 3a08dceda576d..5f0fabbb9af32 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -18,7 +18,7 @@ Astro supports the following file types in the `src/pages/` directory:
 
 ## File-based routing
 
-Astro leverages a routing strategy called **file-based routing.**. Each page file in your `src/pages` directory becomes an endpoint on your site based on its file path.
+Astro leverages a routing strategy called **file-based routing.**. Each file in your `src/pages` directory becomes an endpoint on your site based on its file path.
 
 Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
 

From 1820d3b37cc820e6f9f609e8fc4f5d283a28b7c2 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:29:43 -0400
Subject: [PATCH 28/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 5f0fabbb9af32..653d93fabb4cd 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -56,9 +56,9 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 📚 Read more about [layout components](/en/core-concepts/layouts/) in Astro.
 
-## Markdown Pages
+## Markdown/MDX Pages
 
-Astro also treats any Markdown (`.md`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.
+Astro also treats any Markdown (`.md`) and MDX (`.mdx`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.
 
 Page layouts are especially useful for [Markdown files.](#markdown-pages) Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
 

From 10b7e80d8340c77152c928b76fac50d78509cf48 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:39:56 -0400
Subject: [PATCH 29/39] fix markdown fragment link

---
 src/pages/en/core-concepts/astro-pages.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 653d93fabb4cd..ccdd6f78335ed 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -11,7 +11,7 @@ i18nReady: true
 
 Astro supports the following file types in the `src/pages/` directory:
 - [`.astro`](#astro-pages)
-- [`.md`](#markdown-pages)
+- [`.md`](#markdownmdx-pages)
 - `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
 - [`.js`/`.ts`](#file-routes)
 - [`.html`](#html-pages)
@@ -60,7 +60,7 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 Astro also treats any Markdown (`.md`) and MDX (`.mdx`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.
 
-Page layouts are especially useful for [Markdown files.](#markdown-pages) Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
+Page layouts are especially useful for [Markdown files.](#markdownmdx-pages) Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
 
 ```md {3}
 ---

From f024ab7b81845a7d8d9d24b029d534cdefd42cf3 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:41:11 -0400
Subject: [PATCH 30/39] link to actual mdx installationg guide

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index ccdd6f78335ed..139c086ade5e7 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -12,7 +12,7 @@ i18nReady: true
 Astro supports the following file types in the `src/pages/` directory:
 - [`.astro`](#astro-pages)
 - [`.md`](#markdownmdx-pages)
-- `.mdx` (with the [MDX Integration installed](/en/guides/markdown-content/#mdx-features))
+- `.mdx` (with the [MDX Integration installed](/en/guides/integrations-guide/mdx/#installation))
 - [`.js`/`.ts`](#file-routes)
 - [`.html`](#html-pages)
 

From fbf501b1d826626102ffa939442c2c9401de1911 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:42:30 -0400
Subject: [PATCH 31/39] remove duplicate period

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 139c086ade5e7..c0c5311134c56 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -18,7 +18,7 @@ Astro supports the following file types in the `src/pages/` directory:
 
 ## File-based routing
 
-Astro leverages a routing strategy called **file-based routing.**. Each file in your `src/pages` directory becomes an endpoint on your site based on its file path.
+Astro leverages a routing strategy called **file-based routing**. Each file in your `src/pages` directory becomes an endpoint on your site based on its file path.
 
 Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
 

From 18d666a340e2ba7fcb5fcd72bb3980193c30966e Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 13:51:39 -0400
Subject: [PATCH 32/39] clarify file route extensions behavior

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c0c5311134c56..db1118c46dfb4 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -80,7 +80,7 @@ This is my page, written in **Markdown.**
 
 **File Routes** are script files that end with the `.js` or `.ts` extension and are located within the `src/pages/` directory. These can build non-HTML pages, like .json or .xml, or even assets such as images.
 
-Built filenames and extensions are based on the source file's name, ex: `src/pages/data.json.ts` will be built to match the `/data.json` route in your final build.
+The `.js` or `.ts` extension will be removed during the build process. For example, `src/pages/data.json.ts` will be built to match the `/data.json` route. 
 
 ```js
 // Example: src/pages/builtwith.json.ts

From 81eb8f9ecfcaa41a5cdbc79a7b2b088d91041d34 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:03:06 -0400
Subject: [PATCH 33/39]  'if you have the mdx integration installed...'

---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index db1118c46dfb4..c078bd422b480 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -58,7 +58,7 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 ## Markdown/MDX Pages
 
-Astro also treats any Markdown (`.md`) and MDX (`.mdx`) files inside of `/src/pages/` as pages in your final website. These are commonly used for text-heavy pages like blog posts and documentation.
+Astro also treats any Markdown (`.md`) files inside of `src/pages/` as pages in your final website. If you have the [MDX Integration installed](/en/guides/integrations-guide/mdx/#installation), it also treats MDX (`.mdx`) files the same way. These are commonly used for text-heavy pages like blog posts and documentation.
 
 Page layouts are especially useful for [Markdown files.](#markdownmdx-pages) Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
 

From d821a79c2714daf2dc45a1ba922eb0add5408768 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:17:10 -0400
Subject: [PATCH 34/39] grammar nit

---
 src/pages/en/core-concepts/astro-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index b4a82f38e9418..d44e5817f9cce 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -502,7 +502,7 @@ HTML components must contain only valid HTML, and therefore lack key Astro compo
 - They can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
 
 :::note
-A [`<slot />` element](/en/core-concepts/astro-components/#slots) inside an HTML component will work as it does in Astro component. In order to use the [HTML Web Component Slot](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) element instead, add `is:inline` to your `<slot>` element.
+A [`<slot />` element](/en/core-concepts/astro-components/#slots) inside an HTML component will work as it would in an Astro component. In order to use the [HTML Web Component Slot](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) element instead, add `is:inline` to your `<slot>` element.
 :::
 
 ## Next Steps

From 719e470a59cb924075a3323ad15096b3980ed89f Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:44:02 -0400
Subject: [PATCH 35/39] Update src/pages/en/core-concepts/astro-components.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-components.md b/src/pages/en/core-concepts/astro-components.md
index d44e5817f9cce..b0d8efbf2e5e0 100644
--- a/src/pages/en/core-concepts/astro-components.md
+++ b/src/pages/en/core-concepts/astro-components.md
@@ -499,7 +499,7 @@ Astro supports importing and using `.html` files as components or placing these
 HTML components must contain only valid HTML, and therefore lack key Astro component features:
 - They don't support frontmatter, server-side imports, or dynamic expressions.
 - Any `<script>` tags are left unbundled, treated as if they had `is:inline`. 
-- They can only [reference assets that are in the `public/` folder.](/en/guides/images/#public)
+- They can only [reference assets that are in the `public/` folder](/en/guides/images/#public).
 
 :::note
 A [`<slot />` element](/en/core-concepts/astro-components/#slots) inside an HTML component will work as it would in an Astro component. In order to use the [HTML Web Component Slot](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/slot) element instead, add `is:inline` to your `<slot>` element.

From 4d4094b943d61d543b47776c83803e92e2c87fac Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:44:09 -0400
Subject: [PATCH 36/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c078bd422b480..1f22e05037635 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -18,7 +18,7 @@ Astro supports the following file types in the `src/pages/` directory:
 
 ## File-based routing
 
-Astro leverages a routing strategy called **file-based routing**. Each file in your `src/pages` directory becomes an endpoint on your site based on its file path.
+Astro leverages a routing strategy called **file-based routing**. Each file in your `src/pages/` directory becomes an endpoint on your site based on its file path.
 
 Write standard HTML [`<a>` elements](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/a) in your component template to link between pages.
 

From dd3be140d2f45d2ad59aca4077c0acd66b8e081b Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:44:17 -0400
Subject: [PATCH 37/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index 1f22e05037635..c6d4843b6c508 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -60,7 +60,7 @@ import MySiteLayout from '../layouts/MySiteLayout.astro';
 
 Astro also treats any Markdown (`.md`) files inside of `src/pages/` as pages in your final website. If you have the [MDX Integration installed](/en/guides/integrations-guide/mdx/#installation), it also treats MDX (`.mdx`) files the same way. These are commonly used for text-heavy pages like blog posts and documentation.
 
-Page layouts are especially useful for [Markdown files.](#markdownmdx-pages) Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
+Page layouts are especially useful for [Markdown files](#markdownmdx-pages). Markdown files can use the special `layout` front matter property to specify a [layout component](/en/core-concepts/layouts/) that will wrap their Markdown content in a full `<html>...</html>` page document.
 
 ```md {3}
 ---

From 8e9cf3865e8bf7d62311916d0d46ead0425b0f82 Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:45:01 -0400
Subject: [PATCH 38/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index c6d4843b6c508..b3af728368b0a 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -143,7 +143,7 @@ export const get: APIRoute = ({ params, request }) => {
 
 ## HTML Pages
 
-You can place a `.html` file in the `/src/pages/` directory. This will be treated as an [HTML Component](/en/core-concepts/astro-components/#html-components) and turned into a page.
+Files with the `.html` file extension can be placed in the `src/pages/` and used directly as pages on your site. Note that some key Astro features are not supported in [HTML Component](/en/core-concepts/astro-components/#html-components).
 
 ## Custom 404 Error Page
 

From 9f36f5f64947af8174ba053356df9b1133207ade Mon Sep 17 00:00:00 2001
From: Dan Jutan <danjutan@gmail.com>
Date: Tue, 13 Sep 2022 14:51:10 -0400
Subject: [PATCH 39/39] Update src/pages/en/core-concepts/astro-pages.md

Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
---
 src/pages/en/core-concepts/astro-pages.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/en/core-concepts/astro-pages.md b/src/pages/en/core-concepts/astro-pages.md
index b3af728368b0a..02c560979971c 100644
--- a/src/pages/en/core-concepts/astro-pages.md
+++ b/src/pages/en/core-concepts/astro-pages.md
@@ -143,7 +143,7 @@ export const get: APIRoute = ({ params, request }) => {
 
 ## HTML Pages
 
-Files with the `.html` file extension can be placed in the `src/pages/` and used directly as pages on your site. Note that some key Astro features are not supported in [HTML Component](/en/core-concepts/astro-components/#html-components).
+Files with the `.html` file extension can be placed in the `src/pages/` and used directly as pages on your site. Note that some key Astro features are not supported in [HTML Components](/en/core-concepts/astro-components/#html-components).
 
 ## Custom 404 Error Page
 
