Skip to content

Commit 3adb639

Browse files
committed
Merge branch 'main' into release-next
2 parents a5451d5 + 7ce38dc commit 3adb639

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
- tkindy
219219
- tlinhart
220220
- tom-sherman
221+
- tomasr8
221222
- triangularcube
222223
- trungpv1601
223224
- turansky

docs/route/action.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ new: true
77

88
Route actions are the "writes" to route [loader][loader] "reads". They provide a way for apps to perform data mutations with simple HTML and HTTP semantics while React Router abstracts away the complexity of asynchronous UI and revalidation. This gives you the simple mental model of HTML + HTTP (where the browser handles the asynchrony and revalidation) with the behavior and UX capabilities of modern SPAs.
99

10-
<docs-error>This feature only works if using a data router like [`createBrowserRouter`][createbrowserrouter]</docs-error>
10+
<docs-warning>This feature only works if using a data router, see [Picking a Router][pickingarouter]</docs-warning>
1111

1212
```tsx
1313
<Route

docs/route/error-element.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ When exceptions are thrown in [loaders][loader], [actions][action], or component
99

1010
<docs-info>If you do not wish to specify a React element (i.e., `errorElement={<MyErrorBoundary />}`) you may specify an `ErrorBoundary` component instead (i.e., `ErrorBoundary={MyErrorBoundary}`) and React Router will call `createElement` for you internally.</docs-info>
1111

12-
<docs-error>This feature only works if using a data router like [`createBrowserRouter`][createbrowserrouter]</docs-error>
12+
<docs-warning>This feature only works if using a data router, see [Picking a Router][pickingarouter]</docs-warning>
1313

1414
```tsx
1515
<Route

0 commit comments

Comments
 (0)