From 9e63dd75a5050e6ca384ee6c6f274d5b367310a4 Mon Sep 17 00:00:00 2001 From: tianci Date: Fri, 4 Mar 2022 15:50:52 +0800 Subject: [PATCH 1/5] More detailed man numbering information~ --- docs/books/admin_guide/03-commands.md | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/books/admin_guide/03-commands.md b/docs/books/admin_guide/03-commands.md index c43b153728..b7564e6257 100644 --- a/docs/books/admin_guide/03-commands.md +++ b/docs/books/admin_guide/03-commands.md @@ -171,14 +171,15 @@ clear (1) - clear the terminal screen Once found by `apropos` or `whatis`, the manual is read by `man` ("Man is your friend"). This set of manuals is divided into 8 sections, grouping information by topic, the default section being 1: -1. User Commands; -2. System Calls; -3. C library functions; -4. Peripherals and special files; -5. File formats ; -6. Games; -7. Miscellaneous; -8. System administration tools and daemons. +1. Executable programs or commands +2. System calls (functions given by the kernel) +3. Library calls (functions given by the library) +4. Special files (usually found in /dev) +5. File Formats and conventions (configuration files such as etc/passwd) +6. Games (such as character-based applications) +7. Miscellaneous (e.g. man (7)) +8. System administration commands (usually only for root) +9. Kernel routines (non-standard) Information about each section can be accessed by typing `man x intro`, where `x` is the section number. From 1bfc612abe8de2eaf4eeb35959692d6b98ab9406 Mon Sep 17 00:00:00 2001 From: tianci Date: Fri, 4 Mar 2022 16:30:55 +0800 Subject: [PATCH 2/5] Fix sentences with ambiguous meaning --- docs/books/admin_guide/03-commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/books/admin_guide/03-commands.md b/docs/books/admin_guide/03-commands.md index b7564e6257..81608e160d 100644 --- a/docs/books/admin_guide/03-commands.md +++ b/docs/books/admin_guide/03-commands.md @@ -197,7 +197,7 @@ $ man 5 passwd will inform him about the files related to the command. -Not all pages of the manual are translated from English. However, they are generally very accurate and provide all the information needed. The syntax used and the division may confuse the beginner administrator, but with practice, he will quickly find the information he is looking for. +Not all manuals are translated from English. However, English manuals are usually very accurate and provide all the information you need. The grammar rules and separation rules it uses may confuse beginner administrators, but after practice, I'm sure you'll find the information you want. The navigation in the manual is done with the arrows ↑ and ↓. The manual is exited by pressing the q key. From da8dd5550c235be1ee92385e00a5d7c6d64b23af Mon Sep 17 00:00:00 2001 From: tianci Date: Fri, 4 Mar 2022 16:37:33 +0800 Subject: [PATCH 3/5] update --- docs/books/admin_guide/03-commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/books/admin_guide/03-commands.md b/docs/books/admin_guide/03-commands.md index 81608e160d..fe214c15aa 100644 --- a/docs/books/admin_guide/03-commands.md +++ b/docs/books/admin_guide/03-commands.md @@ -197,7 +197,7 @@ $ man 5 passwd will inform him about the files related to the command. -Not all manuals are translated from English. However, English manuals are usually very accurate and provide all the information you need. The grammar rules and separation rules it uses may confuse beginner administrators, but after practice, I'm sure you'll find the information you want. +Not all manuals pages are translated from English. However, English manual pages are usually very accurate and provide all the information you need. The grammar rules and separation rules it uses may confuse beginner administrators, but after practice, I'm sure you'll find the information you want. The navigation in the manual is done with the arrows ↑ and ↓. The manual is exited by pressing the q key. From 0735ed5659714233707abcfecd919031ced494be Mon Sep 17 00:00:00 2001 From: tianci Date: Fri, 4 Mar 2022 17:26:49 +0800 Subject: [PATCH 4/5] Modify the description of the -w option~ --- docs/books/admin_guide/03-commands.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/books/admin_guide/03-commands.md b/docs/books/admin_guide/03-commands.md index fe214c15aa..ffeb40fc67 100644 --- a/docs/books/admin_guide/03-commands.md +++ b/docs/books/admin_guide/03-commands.md @@ -243,7 +243,7 @@ $ history | Options | Comments | | ------- | ------------------------------------------------------------------------------------------------------------------ | -| `-w` | The `-w` option will copy the history of the current session to it. | +| `-w` | write the current history to the history file | | `-c` | The `-c` option will delete the history of the current session (but not the contents of the `.bash_history` file). | * Manipulating history: From a0a49ab3836906b49d92ad62f02146c555231995 Mon Sep 17 00:00:00 2001 From: tianci Date: Fri, 4 Mar 2022 23:05:58 +0800 Subject: [PATCH 5/5] Fix missing colons --- docs/books/admin_guide/03-commands.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/books/admin_guide/03-commands.md b/docs/books/admin_guide/03-commands.md index ffeb40fc67..81434718a8 100644 --- a/docs/books/admin_guide/03-commands.md +++ b/docs/books/admin_guide/03-commands.md @@ -171,15 +171,15 @@ clear (1) - clear the terminal screen Once found by `apropos` or `whatis`, the manual is read by `man` ("Man is your friend"). This set of manuals is divided into 8 sections, grouping information by topic, the default section being 1: -1. Executable programs or commands -2. System calls (functions given by the kernel) -3. Library calls (functions given by the library) -4. Special files (usually found in /dev) -5. File Formats and conventions (configuration files such as etc/passwd) -6. Games (such as character-based applications) -7. Miscellaneous (e.g. man (7)) -8. System administration commands (usually only for root) -9. Kernel routines (non-standard) +1. Executable programs or commands; +2. System calls (functions given by the kernel); +3. Library calls (functions given by the library); +4. Special files (usually found in /dev); +5. File Formats and conventions (configuration files such as etc/passwd); +6. Games (such as character-based applications); +7. Miscellaneous (e.g. man (7)); +8. System administration commands (usually only for root); +9. Kernel routines (non-standard). Information about each section can be accessed by typing `man x intro`, where `x` is the section number. @@ -243,7 +243,7 @@ $ history | Options | Comments | | ------- | ------------------------------------------------------------------------------------------------------------------ | -| `-w` | write the current history to the history file | +| `-w` | Write the current history to the history file | | `-c` | The `-c` option will delete the history of the current session (but not the contents of the `.bash_history` file). | * Manipulating history: