Merge branch 'canary' into cow258/fix-debug-port-conflict

vercel · Jun 19, 2023 · 981a85f · 981a85f
2 parents 5758ced + ac74b58
commit 981a85f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docs/02-app/01-building-your-application/02-rendering/index.mdx b/docs/02-app/01-building-your-application/02-rendering/index.mdx
@@ -12,7 +12,7 @@ React 18 and Next.js 13 introduced new ways to render your application. This pag
 There are two environments where your application code can be rendered: the client and the server.
 
 <Image
-  alt="Client and Server Environemnts"
+  alt="Client and Server Environments"
   srcLight="/docs/light/client-and-server-environments.png"
   srcDark="/docs/dark/client-and-server-environments.png"
   width="1600"

diff --git a/docs/02-app/01-building-your-application/03-data-fetching/04-server-actions.mdx b/docs/02-app/01-building-your-application/03-data-fetching/04-server-actions.mdx
@@ -545,7 +545,7 @@ React also provides built-in solutions for [optimistic updates](#experimental-us
 
 ### Form Actions
 
-[Actions](#actions) integrated into the web standard `<form>` API, and enable out-of-the-box progressive enhancement and [loading states](#experimental-useformstatus). Similar to the HTML primitive [`formaction`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#formation).
+[Actions](#actions) integrated into the web standard `<form>` API, and enable out-of-the-box progressive enhancement and [loading states](#experimental-useformstatus). Similar to the HTML primitive [`formaction`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#formaction).
 
 ### Server Functions
 

diff --git a/docs/05-community/01-contribution-guide.mdx b/docs/05-community/01-contribution-guide.mdx
@@ -68,7 +68,7 @@ Please let us know if you have any questions or need further assistance in your
 
 The docs use **file-system routing**. Each folder and files inside [`/docs`](/vercel/next.js/tree/canary/docs) represent a route segment. These segments are used to generate the URL paths, navigation, and breadcrumbs.
 
-The file structure reflects the navigation that you see on the site, and by default, navigation items are sorted alphabetically. However, we can change the order of the items by appending a two-digit number (`00-`) to the folder or file name.
+The file structure reflects the navigation that you see on the site, and by default, navigation items are sorted alphabetically. However, we can change the order of the items by prepending a two-digit number (`00-`) to the folder or file name.
 
 For example, in the [functions API Reference](/docs/app/api-reference/functions), the pages are sorted alphabetically because it makes it easier for developers to find a specific function: