From c1b14084f9d0e9a25c06b1a574a1697f9a6da4e4 Mon Sep 17 00:00:00 2001
From: Paul van Tilburg <paul@luon.net>
Date: Tue, 15 Jun 2021 21:08:36 +0200
Subject: [PATCH] Fix a few minor mistakes in the guide.

---
 site/guide/4-requests.md  | 5 +++--
 site/guide/5-responses.md | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/site/guide/4-requests.md b/site/guide/4-requests.md
index 31d32b4e..08a0d387 100644
--- a/site/guide/4-requests.md
+++ b/site/guide/4-requests.md
@@ -211,7 +211,7 @@ there are no remaining routes to try. When there are no remaining routes, a
 customizable **404 error** is returned.
 
 Routes are attempted in increasing _rank_ order. Rocket chooses a default
-ranking from -6 to -1, detailed in the next section, but a route's rank can also
+ranking from -12 to -1, detailed in the next section, but a route's rank can also
 be manually set with the `rank` attribute. To illustrate, consider the following
 routes:
 
@@ -781,6 +781,7 @@ fn new(task: Option<Form<Task<'_>>>) { /* .. */ }
 
 [`Form`]: @api/rocket/form/struct.Form.html
 [`FromForm`]: @api/rocket/form/trait.FromForm.html
+[`FromFormField`]: @api/rocket/form/trait.FromFormField.html
 
 ### Parsing Strategy
 
@@ -1734,7 +1735,7 @@ fn hello(name: &str, color: Vec<Color>, person: Person<'_>, other: Option<usize>
 
 // A request with these query segments matches as above.
 # rocket_guide_tests::client(routes![hello]).get("/?\
-color=reg&\
+color=red&\
 color=green&\
 person.pet.name=Fi+Fo+Alex&\
 color=green&\
diff --git a/site/guide/5-responses.md b/site/guide/5-responses.md
index 71e042b7..623d3a0a 100644
--- a/site/guide/5-responses.md
+++ b/site/guide/5-responses.md
@@ -649,8 +649,8 @@ generated.
 ```rust
 # #[macro_use] extern crate rocket;
 
-# #[get("/<id>/<name>?<age>")]
-# fn person(id: Option<usize>, name: &str, age: Option<u8>) { /* .. */ }
+#[get("/<id>/<name>?<age>")]
+fn person(id: Option<usize>, name: &str, age: Option<u8>) { /* .. */ }
 
 /// Note that `id` is `Option<usize>` in the route, but `id` in `uri!` _cannot_
 /// be an `Option`. `age`, on the other hand, _must_ be an `Option` (or `Result`