Merge branch 'main' into release-next

Author: brophdawg11

contributors.yml

@@ -77,6 +77,7 @@
 - ivanjonas
 - jacob-ebey
 - JaffParker
+- jakkku
 - JakubDrozd
 - janpaepke
 - jasonpaulos
@@ -116,6 +117,7 @@
 - markivancho
 - maruffahmed
 - marvinruder
+- matt-harro
 - maxpou
 - mcansh
 - MenouerBetty
@@ -126,6 +128,7 @@
 - modex98
 - morleytatro
 - ms10596
+- ned-park
 - noisypigeon
 - omar-moquete
 - p13i
@@ -138,6 +141,7 @@
 - pyitphyoaung
 - RobHannay
 - rtmann
+- rubeonline
 - ryanflorence
 - ryanhiebert
 - sanketshah19
@@ -151,6 +155,7 @@
 - souzasmatheus
 - srmagura
 - stasundr
+- stmtk1
 - tanayv
 - theostavrides
 - thisiskartik
@@ -173,4 +178,3 @@
 - xavier-lc
 - xcsnowcity
 - yuleicul
-- jakkku

docs/components/form.md

@@ -57,7 +57,7 @@ function ProjectsPage() {
   >
     <Route
       path=":projectId"
-      element={<ProjectPage />}
+      element={<ProjectsPage />}
       action={ProjectsPage.action}
     />
   </Route>

docs/hooks/use-matches.md

@@ -56,7 +56,7 @@ The proverbial use case here is adding breadcrumbs to a parent layout that uses
       // here we use "crumb" and return some elements,
       // this is what we'll render in the breadcrumbs
       // for this route
-      crumb: () => <Link to="/message">Messages</Link>,
+      crumb: () => <Link to="/messages">Messages</Link>,
     }}
   >
     <Route

docs/route/route.md

@@ -205,10 +205,24 @@ let { org, "*": splat } = params;
 
 ### Layout Routes
 
-<docs-info>TODO: expand with example</docs-info>
-
 Omitting the path makes this route a "layout route". It participates in UI nesting, but it does not add any segments to the URL.
 
+```tsx
+<Route
+  element={
+    <div>
+      <h1>Layout</h1>
+      <Outlet />
+    </div>
+  }
+>
+  <Route path="/" element={<h2>Home</h2>} />
+  <Route path="/about" element={<h2>About</h2>} />
+</Route>
+```
+
+In this example, `<h1>Layout</h1>` will be rendered along with each child route's `element` prop, via the layout route's [Outlet][outlet].
+
 ## `index`
 
 Determines if the route is an index route. Index routes render into their parent's [Outlet][outlet] at their parent's URL (like a default child route).

docs/start/tutorial.md

@@ -594,7 +594,7 @@ We'll create new contacts by exporting an `action` in our root route, wiring it
 
 👉 **Create the action and change `<form>` to `<Form>`**
 
-```jsx filename=src/routes/root.jsx lines=[5,7,9-11,22-25]
+```jsx filename=src/routes/root.jsx lines=[5,7,9-12,24-26]
 import {
   Outlet,
   Link,
@@ -1298,7 +1298,7 @@ import {
   useNavigate,
 } from "react-router-dom";
 
-export default function Edit() {
+export default function EditContact() {
   const contact = useLoaderData();
   const navigate = useNavigate();