From ff6f61276e0a077a6cc608dc616f71e9e0294ecf Mon Sep 17 00:00:00 2001
From: curtain <keleidoscope@163.com>
Date: Mon, 20 Feb 2023 14:25:00 +0800
Subject: [PATCH 1/3] basename: move help strings to markdown file

---
 src/uu/basename/basename.md     | 12 ++++++++++++
 src/uu/basename/src/basename.rs |  8 +++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 src/uu/basename/basename.md

diff --git a/src/uu/basename/basename.md b/src/uu/basename/basename.md
new file mode 100644
index 000000000..6af001323
--- /dev/null
+++ b/src/uu/basename/basename.md
@@ -0,0 +1,12 @@
+# basename
+
+## Usage
+```
+basename NAME [SUFFIX]
+basename OPTION... NAME...
+```
+
+## About
+
+Print NAME with any leading directory components removed
+If specified, also remove a trailing SUFFIX
diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs
index 613c4d67c..bbc8abf75 100644
--- a/src/uu/basename/src/basename.rs
+++ b/src/uu/basename/src/basename.rs
@@ -11,13 +11,11 @@ use clap::{crate_version, Arg, ArgAction, Command};
 use std::path::{is_separator, PathBuf};
 use uucore::display::Quotable;
 use uucore::error::{UResult, UUsageError};
-use uucore::format_usage;
+use uucore::{format_usage, help_usage, help_section};
 
-static ABOUT: &str = r#"Print NAME with any leading directory components removed
-If specified, also remove a trailing SUFFIX"#;
+static ABOUT: &str = help_section!("about","basename.md");
 
-const USAGE: &str = "{} NAME [SUFFIX]
-    {} OPTION... NAME...";
+const USAGE: &str = help_usage!("basename.md");
 
 pub mod options {
     pub static MULTIPLE: &str = "multiple";

From f70d23b0182dafb87c9b47e1ac82b42aeba8cacc Mon Sep 17 00:00:00 2001
From: curtain <keleidoscope@163.com>
Date: Mon, 20 Feb 2023 18:13:36 +0800
Subject: [PATCH 2/3] basename: update format according to #4385

---
 src/uu/basename/basename.md     | 3 ---
 src/uu/basename/src/basename.rs | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/uu/basename/basename.md b/src/uu/basename/basename.md
index 6af001323..b17cac74a 100644
--- a/src/uu/basename/basename.md
+++ b/src/uu/basename/basename.md
@@ -1,12 +1,9 @@
 # basename
 
-## Usage
 ```
 basename NAME [SUFFIX]
 basename OPTION... NAME...
 ```
 
-## About
-
 Print NAME with any leading directory components removed
 If specified, also remove a trailing SUFFIX
diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs
index bbc8abf75..48f00f4b8 100644
--- a/src/uu/basename/src/basename.rs
+++ b/src/uu/basename/src/basename.rs
@@ -11,9 +11,9 @@ use clap::{crate_version, Arg, ArgAction, Command};
 use std::path::{is_separator, PathBuf};
 use uucore::display::Quotable;
 use uucore::error::{UResult, UUsageError};
-use uucore::{format_usage, help_usage, help_section};
+use uucore::{format_usage, help_usage, help_about};
 
-static ABOUT: &str = help_section!("about","basename.md");
+static ABOUT: &str = help_about!("basename.md");
 
 const USAGE: &str = help_usage!("basename.md");
 

From e37e5ad9159ca4ed8154076b16f3b883942e9fed Mon Sep 17 00:00:00 2001
From: curtain <keleidoscope@163.com>
Date: Thu, 23 Feb 2023 09:43:54 +0800
Subject: [PATCH 3/3] basename: fix rustfmt problem

---
 src/uu/basename/src/basename.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs
index 48f00f4b8..ed7faee65 100644
--- a/src/uu/basename/src/basename.rs
+++ b/src/uu/basename/src/basename.rs
@@ -11,7 +11,7 @@ use clap::{crate_version, Arg, ArgAction, Command};
 use std::path::{is_separator, PathBuf};
 use uucore::display::Quotable;
 use uucore::error::{UResult, UUsageError};
-use uucore::{format_usage, help_usage, help_about};
+use uucore::{format_usage, help_about, help_usage};
 
 static ABOUT: &str = help_about!("basename.md");