From 0966aa2532f5800b95d1e40234e9324333693ba8 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Fri, 19 Aug 2022 14:37:15 +0100
Subject: [PATCH 1/7] docs: add syntax highligting

---
 docs/getting-started/tutorial.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
index a53064135b..0b4404c1d3 100644
--- a/docs/getting-started/tutorial.md
+++ b/docs/getting-started/tutorial.md
@@ -67,9 +67,10 @@ The `main.jsx` file is the entry point. Open it up and we'll put React Router on
 
 👉 **Add [`DataBrowserRouter`][databrowserrouter] and a [`Route`][route] to `main.jsx`**
 
-```jsx lines=[3,8-10] filename=src/main.jsx
+```jsx lines=[4, 9-11] bad lines=[1] filename=src/main.jsx
 import React from "react";
 import ReactDOM from "react-dom/client";
+import App from './App';
 import { DataBrowserRouter, Route } from "react-router-dom";
 import "./index.css";
 
@@ -586,7 +587,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,9-11,22-24]
+```jsx filename=src/routes/root.jsx lines=[7,5,9-11,22-24]
 import {
   Outlet,
   Link,
@@ -608,6 +609,7 @@ export default function Root() {
       <div id="sidebar">
         <h1>React Router Contacts</h1>
         <div>
+          {/* other code */}
           <Form method="post">
             <button type="submit">New</button>
           </Form>
@@ -696,7 +698,7 @@ export default function Contact() {
 }
 ```
 
-👉 **Configure the loader on the route**
+👉 **Configure the loaderoute's new action on the route**
 
 ```jsx filename=src/main.jsx lines=[3,19]
 /* existing code */
@@ -1733,7 +1735,7 @@ Pretty simple. Pull the form data off the request and send it to the data model.
 
 👉 **Configure the route's new action**
 
-```jsx filename=src/main.jsx lines=[]
+```jsx filename=src/main.jsx lines=[5, 21]
 // existing code
 
 import Contact, {

From 25de6a91600a8383129f2ced1d8e61fe5f5d7650 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Fri, 19 Aug 2022 15:02:55 +0100
Subject: [PATCH 2/7] docs: copypaste error

---
 docs/getting-started/tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
index 0b4404c1d3..e12941b1db 100644
--- a/docs/getting-started/tutorial.md
+++ b/docs/getting-started/tutorial.md
@@ -698,7 +698,7 @@ export default function Contact() {
 }
 ```
 
-👉 **Configure the loaderoute's new action on the route**
+👉 **Configure the loader on the route**
 
 ```jsx filename=src/main.jsx lines=[3,19]
 /* existing code */

From f7a5909debc8a06c2a743443068a6c17435ee640 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Fri, 19 Aug 2022 16:53:24 +0100
Subject: [PATCH 3/7] docs: add error line

---
 docs/getting-started/tutorial.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
index e12941b1db..8d426f7fdf 100644
--- a/docs/getting-started/tutorial.md
+++ b/docs/getting-started/tutorial.md
@@ -67,7 +67,7 @@ The `main.jsx` file is the entry point. Open it up and we'll put React Router on
 
 👉 **Add [`DataBrowserRouter`][databrowserrouter] and a [`Route`][route] to `main.jsx`**
 
-```jsx lines=[4, 9-11] bad lines=[1] filename=src/main.jsx
+```jsx lines=[4, 9-11] bad lines=[3] filename=src/main.jsx
 import React from "react";
 import ReactDOM from "react-dom/client";
 import App from './App';

From f8e22e8dedaae03744d364cdcbca3af793fb3d87 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Fri, 19 Aug 2022 16:58:53 +0100
Subject: [PATCH 4/7] docs: add to contributors

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index 30f0fb3a44..ed47a33aeb 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -79,3 +79,4 @@
 - williamsdyyz
 - xavier-lc
 - fz6m
+- infoxicator

From a99d042bd135ef2871d5507221b1ba03b8b04c2a Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Mon, 22 Aug 2022 10:05:22 +0100
Subject: [PATCH 5/7] fix(): merge conflict

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index b7f99f8d4e..4d2aadf295 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -80,3 +80,4 @@
 - xavier-lc
 - fz6m
 - TkDodo
+- infoxicator

From 430121e49d8127b2b1acb7249633cbe4feb58d14 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Tue, 23 Aug 2022 10:04:35 +0100
Subject: [PATCH 6/7] fix: remove bad lines

---
 docs/getting-started/tutorial.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
index 6c9c281753..7218e5e6fa 100644
--- a/docs/getting-started/tutorial.md
+++ b/docs/getting-started/tutorial.md
@@ -67,10 +67,9 @@ The `main.jsx` file is the entry point. Open it up and we'll put React Router on
 
 👉 **Add [`DataBrowserRouter`][databrowserrouter] and a [`Route`][route] to `main.jsx`**
 
-```jsx lines=[4, 9-11] bad lines=[3] filename=src/main.jsx
+```jsx lines=[3,8-10] filename=src/main.jsx
 import React from "react";
 import ReactDOM from "react-dom/client";
-import App from './App';
 import { DataBrowserRouter, Route } from "react-router-dom";
 import "./index.css";
 

From 5ccd47e31ef1164d5a4e4adc324b2b8222fd4f22 Mon Sep 17 00:00:00 2001
From: Ruben Casas <ruben@infoxication.net>
Date: Tue, 23 Aug 2022 10:06:50 +0100
Subject: [PATCH 7/7] fix: remove bad lines

---
 docs/getting-started/tutorial.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/getting-started/tutorial.md b/docs/getting-started/tutorial.md
index 1735c5d891..7218e5e6fa 100644
--- a/docs/getting-started/tutorial.md
+++ b/docs/getting-started/tutorial.md
@@ -67,10 +67,9 @@ The `main.jsx` file is the entry point. Open it up and we'll put React Router on
 
 👉 **Add [`DataBrowserRouter`][databrowserrouter] and a [`Route`][route] to `main.jsx`**
 
-```jsx lines=[4, 9-11] bad lines=[3] filename=src/main.jsx
+```jsx lines=[3,8-10] filename=src/main.jsx
 import React from "react";
 import ReactDOM from "react-dom/client";
-import App from "./App";
 import { DataBrowserRouter, Route } from "react-router-dom";
 import "./index.css";