Merge pull request #4739 from sylvestre/following

be more consistent in the help. use follow for deference options
uutils · Apr 14, 2023 · c021d3c · c021d3c
2 parents 63f608d + fcc1ebf
commit c021d3c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/uu/du/src/du.rs b/src/uu/du/src/du.rs
@@ -817,14 +817,14 @@ pub fn uu_app() -> Command {
             Arg::new(options::DEREFERENCE)
                 .short('L')
                 .long(options::DEREFERENCE)
-                .help("dereference all symbolic links")
+                .help("follow all symbolic links")
                 .action(ArgAction::SetTrue)
         )
         .arg(
             Arg::new(options::DEREFERENCE_ARGS)
                 .short('D')
                 .long(options::DEREFERENCE_ARGS)
-                .help("dereference only symlinks that are listed on the command line")
+                .help("follow only symlinks that are listed on the command line")
                 .action(ArgAction::SetTrue)
         )
         // .arg(

diff --git a/src/uu/ln/src/ln.rs b/src/uu/ln/src/ln.rs
@@ -199,7 +199,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::LOGICAL)
                 .short('L')
                 .long(options::LOGICAL)
-                .help("dereference TARGETs that are symbolic links")
+                .help("follow TARGETs that are symbolic links")
                 .overrides_with(options::PHYSICAL)
                 .action(ArgAction::SetTrue),
         )

diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -1422,7 +1422,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::dereference::DIR_ARGS)
                 .long(options::dereference::DIR_ARGS)
                 .help(
-                    "Do not dereference symlinks except when they link to directories and are \
+                    "Do not follow symlinks except when they link to directories and are \
                     given as command line arguments.",
                 )
                 .overrides_with_all([
@@ -1436,7 +1436,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::dereference::ARGS)
                 .short('H')
                 .long(options::dereference::ARGS)
-                .help("Do not dereference symlinks except when given as command line arguments.")
+                .help("Do not follow symlinks except when given as command line arguments.")
                 .overrides_with_all([
                     options::dereference::ALL,
                     options::dereference::DIR_ARGS,

diff --git a/src/uu/stat/stat.md b/src/uu/stat/stat.md
@@ -25,7 +25,7 @@ Valid format sequences for files (without `--file-system`):
 - `%i`: inode number
 - `%m`: mount point
 - `%n`: file name
-- `%N`: quoted file name with dereference if symbolic link
+- `%N`: quoted file name with dereference (follow) if symbolic link
 - `%o`: optimal I/O transfer size hint
 - `%s`: total size, in bytes
 - `%t`: major device type in hex, for character/block device special files