diff --git a/docs/01-app/01-getting-started/01-installation.mdx b/docs/01-app/01-getting-started/01-installation.mdx
index 3c10a01e9642..c893e3626c7f 100644
--- a/docs/01-app/01-getting-started/01-installation.mdx
+++ b/docs/01-app/01-getting-started/01-installation.mdx
@@ -1,7 +1,6 @@
---
-title: How to set up a new Next.js project
-nav_title: Installation
-description: Create a new Next.js application with the `create-next-app` CLI, and set up TypeScript, ESLint, and Module Path Aliases.
+title: Installation
+description: Learn how to create a new Next.js application with the `create-next-app` CLI, and set up TypeScript, ESLint, and Module Path Aliases.
---
{/* The content of this doc is shared between the app and pages router. You can use the `Content` component to add content that is specific to the Pages Router. Any shared content should not be wrapped in a component. */}
diff --git a/docs/01-app/01-getting-started/02-project-structure.mdx b/docs/01-app/01-getting-started/02-project-structure.mdx
index b72f755e0629..4002f614a14a 100644
--- a/docs/01-app/01-getting-started/02-project-structure.mdx
+++ b/docs/01-app/01-getting-started/02-project-structure.mdx
@@ -1,7 +1,7 @@
---
title: Project structure and organization
nav_title: Project Structure
-description: An overview of the folder and file conventions in Next.js, and how to organize your project.
+description: Learn the folder and file conventions in Next.js, and how to organize your project.
---
This page provides an overview of **all** the folder and file conventions in Next.js, and recommendations for organizing your project.
diff --git a/docs/01-app/01-getting-started/03-layouts-and-pages.mdx b/docs/01-app/01-getting-started/03-layouts-and-pages.mdx
index 2312fe06c4a3..520943c3df3e 100644
--- a/docs/01-app/01-getting-started/03-layouts-and-pages.mdx
+++ b/docs/01-app/01-getting-started/03-layouts-and-pages.mdx
@@ -1,7 +1,6 @@
---
-title: How to create layouts and pages
-nav_title: Layouts and Pages
-description: Create your first pages and layouts, and link between them.
+title: Layouts and Pages
+description: Learn how to create your first pages and layouts, and link between them with the Link component.
related:
title: API Reference
description: Learn more about the features mentioned in this page by reading the API Reference.
diff --git a/docs/01-app/01-getting-started/04-linking-and-navigating.mdx b/docs/01-app/01-getting-started/04-linking-and-navigating.mdx
index b201ad728170..f23cb603fb02 100644
--- a/docs/01-app/01-getting-started/04-linking-and-navigating.mdx
+++ b/docs/01-app/01-getting-started/04-linking-and-navigating.mdx
@@ -1,10 +1,11 @@
---
title: Linking and Navigating
-description: Learn how prefetching, prerendering, and client-side navigation works in Next.js, and how to use the Link Component.
+description: Learn how the built-in navigation optimizations work, including prefetching, prerendering, and client-side navigation, and how to optimize navigation for dynamic routes and slow networks.
related:
links:
- app/api-reference/components/link
- app/api-reference/file-conventions/loading
+ - app/guides/prefetching
---
In Next.js, routes are rendered on the server by default. This often means the client has to wait for a server response before a new route can be shown. Next.js comes built-in [prefetching](#prefetching), [streaming](#streaming), and [client-side transitions](#client-side-transitions) ensuring navigation stays fast and responsive.
diff --git a/docs/01-app/01-getting-started/08-server-and-client-components.mdx b/docs/01-app/01-getting-started/05-server-and-client-components.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/08-server-and-client-components.mdx
rename to docs/01-app/01-getting-started/05-server-and-client-components.mdx
index d3775d88212a..102934b34ff6 100644
--- a/docs/01-app/01-getting-started/08-server-and-client-components.mdx
+++ b/docs/01-app/01-getting-started/05-server-and-client-components.mdx
@@ -1,6 +1,5 @@
---
-title: How to use Server and Client Components
-nav_title: Server and Client Components
+title: Server and Client Components
description: Learn how you can use React Server and Client Components to render parts of your application on the server or the client.
related:
title: Next Steps
diff --git a/docs/01-app/01-getting-started/13-partial-prerendering.mdx b/docs/01-app/01-getting-started/06-partial-prerendering.mdx
similarity index 98%
rename from docs/01-app/01-getting-started/13-partial-prerendering.mdx
rename to docs/01-app/01-getting-started/06-partial-prerendering.mdx
index efff30506b18..e6ca866d1f5a 100644
--- a/docs/01-app/01-getting-started/13-partial-prerendering.mdx
+++ b/docs/01-app/01-getting-started/06-partial-prerendering.mdx
@@ -1,7 +1,6 @@
---
-title: How to use Partial Prerendering
-nav_title: Partial Prerendering
-description: Learn how to combine the benefits of static and dynamic rendering with Partial Prerendering.
+title: Partial Prerendering
+description: Learn how to use Partial Prerendering and combine the benefits of static and dynamic rendering.
version: experimental
related:
title: Next Steps
diff --git a/docs/01-app/01-getting-started/09-fetching-data.mdx b/docs/01-app/01-getting-started/07-fetching-data.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/09-fetching-data.mdx
rename to docs/01-app/01-getting-started/07-fetching-data.mdx
index 5c97c4fc221f..6c09fd7b75b2 100644
--- a/docs/01-app/01-getting-started/09-fetching-data.mdx
+++ b/docs/01-app/01-getting-started/07-fetching-data.mdx
@@ -1,11 +1,11 @@
---
-title: How to fetch data and stream
-nav_title: Fetching Data
-description: Start fetching data and streaming content in your application.
+title: Fetching Data and Streaming
+description: Learn how to fetch data and stream content that depends on data.
related:
title: API Reference
description: Learn more about the features mentioned in this page by reading the API Reference.
links:
+ - app/guides/data-security
- app/api-reference/functions/fetch
- app/api-reference/file-conventions/loading
- app/api-reference/config/next-config-js/logging
diff --git a/docs/01-app/01-getting-started/11-updating-data.mdx b/docs/01-app/01-getting-started/08-updating-data.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/11-updating-data.mdx
rename to docs/01-app/01-getting-started/08-updating-data.mdx
index be22de45a27f..ef121d8dbeb8 100644
--- a/docs/01-app/01-getting-started/11-updating-data.mdx
+++ b/docs/01-app/01-getting-started/08-updating-data.mdx
@@ -1,7 +1,6 @@
---
-title: How to update data
-nav_title: Updating Data
-description: Learn how to update data in your Next.js application.
+title: Updating data
+description: Learn how to mutate data using Server Functions.
related:
title: API Reference
description: Learn more about the features mentioned in this page by reading the API Reference.
diff --git a/docs/01-app/01-getting-started/12-error-handling.mdx b/docs/01-app/01-getting-started/09-error-handling.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/12-error-handling.mdx
rename to docs/01-app/01-getting-started/09-error-handling.mdx
index 7f3350787ded..52e1a7b49f70 100644
--- a/docs/01-app/01-getting-started/12-error-handling.mdx
+++ b/docs/01-app/01-getting-started/09-error-handling.mdx
@@ -1,6 +1,5 @@
---
-title: How to handle errors
-nav_title: Error Handling
+title: Error Handling
description: Learn how to display expected errors and handle uncaught exceptions.
related:
title: API Reference
diff --git a/docs/01-app/01-getting-started/10-caching-and-revalidating.mdx b/docs/01-app/01-getting-started/10-caching-and-revalidating.mdx
index 954c50307ac6..5ea51c6f81b8 100644
--- a/docs/01-app/01-getting-started/10-caching-and-revalidating.mdx
+++ b/docs/01-app/01-getting-started/10-caching-and-revalidating.mdx
@@ -1,6 +1,5 @@
---
-title: How to cache and revalidate data
-nav_title: Caching and Revalidating
+title: Caching and Revalidating
description: Learn how to cache and revalidate data in your application.
related:
title: API Reference
diff --git a/docs/01-app/01-getting-started/07-css.mdx b/docs/01-app/01-getting-started/11-css.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/07-css.mdx
rename to docs/01-app/01-getting-started/11-css.mdx
index 1435667b5a37..7648230d5def 100644
--- a/docs/01-app/01-getting-started/07-css.mdx
+++ b/docs/01-app/01-getting-started/11-css.mdx
@@ -1,6 +1,5 @@
---
-title: How to use CSS in your application
-nav_title: CSS
+title: CSS
description: Learn about the different ways to add CSS to your application, including CSS Modules, Global CSS, Tailwind CSS, and more.
related:
title: Next Steps
diff --git a/docs/01-app/01-getting-started/05-images.mdx b/docs/01-app/01-getting-started/12-images.mdx
similarity index 99%
rename from docs/01-app/01-getting-started/05-images.mdx
rename to docs/01-app/01-getting-started/12-images.mdx
index eb880feb8f5c..0059d00e8e0f 100644
--- a/docs/01-app/01-getting-started/05-images.mdx
+++ b/docs/01-app/01-getting-started/12-images.mdx
@@ -1,6 +1,5 @@
---
-title: How to optimize images
-nav_title: Images
+title: Image Optimization
description: Learn how to optimize images in Next.js
related:
title: API Reference
diff --git a/docs/01-app/01-getting-started/06-fonts.mdx b/docs/01-app/01-getting-started/13-fonts.mdx
similarity index 98%
rename from docs/01-app/01-getting-started/06-fonts.mdx
rename to docs/01-app/01-getting-started/13-fonts.mdx
index 0cc676aa04e0..dedc5e345157 100644
--- a/docs/01-app/01-getting-started/06-fonts.mdx
+++ b/docs/01-app/01-getting-started/13-fonts.mdx
@@ -1,7 +1,6 @@
---
-title: How to use fonts
-nav_title: Fonts
-description: Learn how to use fonts in Next.js
+title: Font Optimization
+description: Learn how to optimize fonts in Next.js
related:
title: API Reference
description: See the API Reference for the full feature set of Next.js Font
diff --git a/docs/01-app/01-getting-started/14-metadata-and-og-images.mdx b/docs/01-app/01-getting-started/14-metadata-and-og-images.mdx
index ce6e0c847939..c41b578e8ed1 100644
--- a/docs/01-app/01-getting-started/14-metadata-and-og-images.mdx
+++ b/docs/01-app/01-getting-started/14-metadata-and-og-images.mdx
@@ -1,6 +1,5 @@
---
-title: How to add metadata and create OG images
-nav_title: Metadata and OG images
+title: Metadata and OG images
description: Learn how to add metadata to your pages and create dynamic OG images.
related:
title: API Reference
diff --git a/docs/01-app/01-getting-started/15-deploying.mdx b/docs/01-app/01-getting-started/15-deploying.mdx
index 2280438ffe60..2889d3b5fc3a 100644
--- a/docs/01-app/01-getting-started/15-deploying.mdx
+++ b/docs/01-app/01-getting-started/15-deploying.mdx
@@ -1,6 +1,5 @@
---
-title: How to deploy your Next.js application
-nav_title: Deploying
+title: Deploying
description: Learn how to deploy your Next.js application.
---
diff --git a/docs/01-app/01-getting-started/16-upgrading.mdx b/docs/01-app/01-getting-started/16-upgrading.mdx
index ece1c7521c8c..f40f5aa064e9 100644
--- a/docs/01-app/01-getting-started/16-upgrading.mdx
+++ b/docs/01-app/01-getting-started/16-upgrading.mdx
@@ -1,7 +1,6 @@
---
-title: How to upgrade your Next.js app
-nav_title: Upgrading
-description: Learn how to upgrade your Next.js application to the latest version.
+title: Upgrading
+description: Learn how to upgrade your Next.js application to the latest version or canary.
related:
title: Version guides
description: See the version guides for in-depth upgrade instructions.
diff --git a/docs/01-app/02-guides/index.mdx b/docs/01-app/02-guides/index.mdx
index 4f1a10b0c789..4f606ae4940d 100644
--- a/docs/01-app/02-guides/index.mdx
+++ b/docs/01-app/02-guides/index.mdx
@@ -1,63 +1,4 @@
---
title: Guides
-description: Learn how to implement common UI patterns and use cases using Next.js
+description: Learn how to implement common patterns and real-world use cases using Next.js
---
-
-### Data Fetching
-
-- [Using the `fetch` API](/docs/app/getting-started/fetching-data#with-the-fetch-api)
-- [Using an ORM or database client](/docs/app/getting-started/fetching-data#with-an-orm-or-database)
-- [Reading search params on the server](/docs/app/api-reference/file-conventions/page)
-- [Reading search params on the client](/docs/app/api-reference/functions/use-search-params)
-
-### Revalidating Data
-
-- [Using ISR to revalidate data after a certain time](/docs/app/guides/incremental-static-regeneration#time-based-revalidation)
-- [Using ISR to revalidate data on-demand](/docs/app/guides/incremental-static-regeneration#on-demand-revalidation-with-revalidatepath)
-
-### Forms
-
-- [Showing a pending state while submitting a form](/docs/app/guides/forms)
-- [Server-side form validation](/docs/app/guides/forms)
-- [Handling expected errors](/docs/app/getting-started/error-handling#handling-expected-errors)
-- [Handling unexpected exceptions](/docs/app/getting-started/error-handling#handling-uncaught-exceptions)
-- [Showing optimistic UI updates](/docs/app/guides/forms#optimistic-updates)
-- [Programmatic form submission](/docs/app/guides/forms#programmatic-form-submission)
-
-### Server Actions
-
-- [Passing additional values](/docs/app/guides/forms)
-- [Revalidating data](/docs/app/getting-started/updating-data#revalidating)
-- [Redirecting](/docs/app/guides/redirecting)
-- [Setting cookies](/docs/app/api-reference/functions/cookies#setting-a-cookie)
-- [Deleting cookies](/docs/app/api-reference/functions/cookies#deleting-cookies)
-
-### Metadata
-
-- [Creating an RSS feed](/docs/app/api-reference/file-conventions/route#non-ui-responses)
-- [Creating an Open Graph image](/docs/app/api-reference/file-conventions/metadata/opengraph-image)
-- [Creating a sitemap](/docs/app/api-reference/file-conventions/metadata/sitemap)
-- [Creating a robots.txt file](/docs/app/api-reference/file-conventions/metadata/robots)
-- [Creating a custom 404 page](/docs/app/api-reference/file-conventions/not-found)
-- [Creating a custom 500 page](/docs/app/api-reference/file-conventions/error)
-
-### Auth
-
-- [Creating a sign-up form](/docs/app/guides/authentication#sign-up-and-login-functionality)
-- [Stateless, cookie-based session management](/docs/app/guides/authentication#stateless-sessions)
-- [Stateful, database-backed session management](/docs/app/guides/authentication#database-sessions)
-- [Managing authorization](/docs/app/guides/authentication#authorization)
-
-### Testing
-
-- [Vitest](/docs/app/guides/testing/vitest)
-- [Jest](/docs/app/guides/testing/jest)
-- [Playwright](/docs/app/guides/testing/playwright)
-- [Cypress](/docs/app/guides/testing/cypress)
-
-### Deployment
-
-- [Creating a Dockerfile](/docs/app/getting-started/deploying#docker)
-- [Creating a static export (SPA)](/docs/app/guides/static-exports)
-- [Configuring caching when self-hosting](/docs/app/guides/self-hosting#configuring-caching)
-- [Configuring Image Optimization when self-hosting](/docs/app/guides/self-hosting#image-optimization)
diff --git a/docs/01-app/05-api-reference/02-components/form.mdx b/docs/01-app/05-api-reference/02-components/form.mdx
index 10f6b33b3477..14093309fd3c 100644
--- a/docs/01-app/05-api-reference/02-components/form.mdx
+++ b/docs/01-app/05-api-reference/02-components/form.mdx
@@ -1,5 +1,5 @@
---
-title: Form
+title: Form Component
description: Learn how to use the `