Merge branch 'main' into release-next

Author: brophdawg11

.github/workflows/release-comments.yml

@@ -15,7 +15,7 @@ jobs:
           fetch-depth: 0
 
       - name: 📝 Comment on related issues and pull requests
-        uses: mcansh/release-comment-action@v0.3.1
+        uses: remix-run/release-comment-action@v0.4.1
         with:
           DIRECTORY_TO_CHECK: "./packages"
           PACKAGE_NAME: "react-router"

contributors.yml

@@ -20,6 +20,7 @@
 - avipatel97
 - awreese
 - aymanemadidi
+- babafemij-k
 - bavardage
 - bbrowning918
 - BDomzalski
@@ -83,6 +84,7 @@
 - Isammoc
 - ivanjeremic
 - ivanjonas
+- Ivanrenes
 - JackPriceBurns
 - jacob-ebey
 - JaffParker
@@ -143,6 +145,7 @@
 - mfijas
 - MichaelDeBoey
 - michal-antczak
+- mikib0
 - minami-minami
 - minthulim
 - modex98
@@ -212,4 +215,3 @@
 - yionr
 - yuleicul
 - zheng-chuang
-- Ivanrenes

docs/components/nav-link.md

@@ -82,7 +82,7 @@ You can pass a render prop as children to customize the content of the `<NavLink
 
 ## `end`
 
-The `end` prop changes the matching logic for the `active` and `pending` states to only match to the "end" of the NavLinks's `to` path. If the URL is longer than `to`, it will no longer be considered active.
+The `end` prop changes the matching logic for the `active` and `pending` states to only match to the "end" of the NavLink's `to` path. If the URL is longer than `to`, it will no longer be considered active.
 
 Without the end prop, this link is always active because every URL matches `/`.
 

docs/start/concepts.md

@@ -631,7 +631,7 @@ If all the teams are in a list on the left then an empty outlet means you've got
 
 Another way to think of an index route is that it's the default child route when the parent matches but none of its children do.
 
-Depending on the user interface, you might not need an index route, but if there is any sort of persistent navigation in the parent route you'll most likely want index route to fill the space when the user hasn't clicked one of the items yet.
+Depending on the user interface, you might not need an index route, but if there is any sort of persistent navigation in the parent route you'll most likely want an index route to fill the space when the user hasn't clicked one of the items yet.
 
 ### Layout Routes
 

docs/start/tutorial.md

@@ -1784,7 +1784,7 @@ Alright, we're ready to click the star next to the user's name!
 
 <img class="tutorial" loading="lazy" src="/_docs/tutorial/24.webp" />
 
-Check that out, both stars automatically update. Our new `<fetcher.Form method="post">` works almost exactly like a the `<Form>` we've been using: it calls the action and then all data is revalidated automatically--even your errors will be caught the same way.
+Check that out, both stars automatically update. Our new `<fetcher.Form method="post">` works almost exactly like the `<Form>` we've been using: it calls the action and then all data is revalidated automatically--even your errors will be caught the same way.
 
 There is one key difference though, it's not a navigation--the URL doesn't change, the history stack is unaffected.