Merge branch 'canary' into refactor/cleanup-app-render

vercel · Oct 7, 2023 · 379a253 · 379a253
2 parents 35b2a7b + 06ee9d7
commit 379a253
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ding-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx b/...ding-your-application/02-data-fetching/01-fetching-caching-and-revalidating.mdx
@@ -310,7 +310,7 @@ export const getItem = cache(async (id) => {
 
 Although the `getItem` function is called twice, only one query will be made to the database.
 
-```tsx filename="app/item/layout.tsx" switcher
+```tsx filename="app/item/[id]/layout.tsx" switcher
 import { getItem } from '@/utils/get-item'
 
 export default async function Layout({
@@ -323,7 +323,7 @@ export default async function Layout({
 }
 ```
 
-```jsx filename="app/item/layout.js" switcher
+```jsx filename="app/item/[id]/layout.js" switcher
 import { getItem } from '@/utils/get-item'
 
 export default async function Layout({ params: { id } }) {

diff --git a/docs/02-app/01-building-your-application/03-rendering/02-client-components.mdx b/docs/02-app/01-building-your-application/03-rendering/02-client-components.mdx
@@ -91,7 +91,7 @@ Then, on the client:
 
 > **What is hydration?**
 >
-> Hydration is process of attaching event listeners to the DOM, to make the static HTML interactive. Behind the scenes, hydration is done with the [`hydrateRoot`](https://react.dev/reference/react-dom/client/hydrateRoot) React API.
+> Hydration is the process of attaching event listeners to the DOM, to make the static HTML interactive. Behind the scenes, hydration is done with the [`hydrateRoot`](https://react.dev/reference/react-dom/client/hydrateRoot) React API.
 
 ### Subsequent Navigations