Merge branch 'main' into release-next

contributors.yml

@@ -366,6 +366,7 @@
 - kishanhitk
 - kiyadotdev
 - klauspaiva
+- klirium
 - knowler
 - konradkalemba
 - krolebord
@@ -484,6 +485,7 @@
 - n8agrin
 - na2hiro
 - nareshbhatia
+- nauvalazhar
 - naveed-fida
 - navid-kalaei
 - nexxeln
@@ -547,6 +549,7 @@
 - remix-run-bot
 - richardhunghhw
 - riencoertjens
+- risv1
 - rkulinski
 - rlfarman
 - roachjc

docs/file-conventions/routes.md

@@ -246,7 +246,7 @@ Sometimes you want to share a layout with a group of routes without adding any p
 | `/`                        | `app/routes/_index.tsx`         | `app/root.tsx`            |
 | `/login`                   | `app/routes/_auth.login.tsx`    | `app/routes/_auth.tsx`    |
 | `/register`                | `app/routes/_auth.register.tsx` | `app/routes/_auth.tsx`    |
-| `/concerts`                | `app/routes/concerts.tsx`       | `app/routes/concerts.tsx` |
+| `/concerts`                | `app/routes/concerts.tsx`       | `app/root.tsx`            |
 | `/concerts/salt-lake-city` | `app/routes/concerts.$city.tsx` | `app/routes/concerts.tsx` |
 
 Think of the `_leading` underscore as a blanket you're pulling over the filename, hiding the filename from the URL.

docs/start/tutorial.md

@@ -785,7 +785,7 @@ export const action = async ({
 
 Without client side routing, if a server redirected after a `POST` request, the new page would fetch the latest data and render. As we learned before, Remix emulates this model and automatically revalidates the data on the page after the `action` call. That's why the sidebar automatically updates when we save the form. The extra revalidation code doesn't exist without client side routing, so it doesn't need to exist with client side routing in Remix either!
 
-One last thing. Without JavaScript, the [`redirect`][redirect] would be a normal redirect. However, with JavaScript it's a clientside redirect, so the user doesn't lose client state like scroll positions or component state.
+One last thing. Without JavaScript, the [`redirect`][redirect] would be a normal redirect. However, with JavaScript it's a client-side redirect, so the user doesn't lose client state like scroll positions or component state.
 
 ## Redirecting new records to the edit page
 

docs/utils/sessions.md

@@ -218,7 +218,7 @@ Remix makes it easy to store sessions in your own database if needed. The `creat
 - `createData` will be called from `commitSession` on the initial session creation when no session ID exists in the cookie
 - `readData` will be called from `getSession` when a session ID exists in the cookie
 - `updateData` will be called from `commitSession` when a session ID already exists in the cookie
-- `deleteData` is called from `destorySession`
+- `deleteData` is called from `destroySession`
 
 The following example shows how you could do this using a generic database client: