From 8c2fad31647abea48dbbc790983f6cebde4eb2f9 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sat, 5 Mar 2022 23:15:33 +0000
Subject: [PATCH] align hello-world examples

---
 actix-web/README.md           | 17 +++++++++--------
 actix-web/src/lib.rs          | 19 ++++++++++---------
 awc/Cargo.toml                |  2 +-
 awc/src/lib.rs                |  2 +-
 awc/src/responses/response.rs |  2 +-
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/actix-web/README.md b/actix-web/README.md
index d0abb3aae..957fb47b8 100644
--- a/actix-web/README.md
+++ b/actix-web/README.md
@@ -56,18 +56,19 @@ Code:
 ```rust
 use actix_web::{get, web, App, HttpServer, Responder};
 
-#[get("/{id}/{name}/index.html")]
-async fn index(params: web::Path<(u32, String)>) -> impl Responder {
-    let (id, name) = params.into_inner();
-    format!("Hello {}! id:{}", name, id)
+#[get("/hello/{name}")]
+async fn greet(name: web::Path<String>) -> impl Responder {
+    format!("Hello {name}!")
 }
 
 #[actix_web::main] // or #[tokio::main]
 async fn main() -> std::io::Result<()> {
-    HttpServer::new(|| App::new().service(index))
-        .bind(("127.0.0.1", 8080))?
-        .run()
-        .await
+    HttpServer::new(|| {
+        App::new().service(greet)
+    })
+    .bind(("127.0.0.1", 8080))?
+    .run()
+    .await
 }
 ```
 
diff --git a/actix-web/src/lib.rs b/actix-web/src/lib.rs
index 34bee7529..4eab24cec 100644
--- a/actix-web/src/lib.rs
+++ b/actix-web/src/lib.rs
@@ -4,18 +4,19 @@
 //! ```no_run
 //! use actix_web::{get, web, App, HttpServer, Responder};
 //!
-//! #[get("/{id}/{name}/index.html")]
-//! async fn index(path: web::Path<(u32, String)>) -> impl Responder {
-//!     let (id, name) = path.into_inner();
-//!     format!("Hello {}! id:{}", name, id)
+//! #[get("/hello/{name}")]
+//! async fn greet(name: web::Path<String>) -> impl Responder {
+//!     format!("Hello {}!", name)
 //! }
 //!
-//! #[actix_web::main]
+//! #[actix_web::main] // or #[tokio::main]
 //! async fn main() -> std::io::Result<()> {
-//!     HttpServer::new(|| App::new().service(index))
-//!         .bind("127.0.0.1:8080")?
-//!         .run()
-//!         .await
+//!     HttpServer::new(|| {
+//!         App::new().service(greet)
+//!     })
+//!     .bind(("127.0.0.1", 8080))?
+//!     .run()
+//!     .await
 //! }
 //! ```
 //!
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 40d9d34b6..f86aa5543 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -5,7 +5,7 @@ authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "fakeshadow <24548779@qq.com>",
 ]
-description = "Async HTTP and WebSocket client library built on the Actix ecosystem"
+description = "Async HTTP and WebSocket client library"
 keywords = ["actix", "http", "framework", "async", "web"]
 categories = [
     "network-programming",
diff --git a/awc/src/lib.rs b/awc/src/lib.rs
index 970ca2d92..3f5e25330 100644
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -1,4 +1,4 @@
-//! `awc` is a HTTP and WebSocket client library built on the Actix ecosystem.
+//! `awc` is an asynchronous HTTP and WebSocket client library.
 //!
 //! # Making a GET request
 //! ```no_run
diff --git a/awc/src/responses/response.rs b/awc/src/responses/response.rs
index 4e6a05f0f..c7c0a6362 100644
--- a/awc/src/responses/response.rs
+++ b/awc/src/responses/response.rs
@@ -160,7 +160,7 @@ where
     ///
     /// # Errors
     /// `Future` implementation returns error if:
-    /// - content length is greater than [limit](JsonBody::limit) (default: 2 MiB)
+    /// - content length is greater than [limit](ResponseBody::limit) (default: 2 MiB)
     ///
     /// # Examples
     /// ```no_run