diff options
author | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2023-07-13 08:06:26 +0100 |
commit | bd978d0256fd3a67de1a7dd54f1a37f9435be363 (patch) | |
tree | cb869384a533ac0d95fe787d75be6c050e1e7c1a /editors | |
parent | b2901ce8efa050da00e0f3a73f3be9bf9402deea (diff) | |
parent | d70256a5c719439cc6fab6a4571c1bb46178e4c7 (diff) | |
download | busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.gz busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.tar.bz2 busybox-w32-bd978d0256fd3a67de1a7dd54f1a37f9435be363.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'editors')
-rw-r--r-- | editors/awk.c | 2 | ||||
-rw-r--r-- | editors/cmp.c | 2 | ||||
-rw-r--r-- | editors/ed.c | 2 | ||||
-rw-r--r-- | editors/patch.c | 2 | ||||
-rw-r--r-- | editors/patch_toybox.c | 2 | ||||
-rw-r--r-- | editors/vi.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/editors/awk.c b/editors/awk.c index 878fffa1a..5045297cd 100644 --- a/editors/awk.c +++ b/editors/awk.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config AWK | 9 | //config:config AWK |
10 | //config: bool "awk (23 kb)" | 10 | //config: bool "awk (24 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: Awk is used as a pattern scanning and processing language. | 13 | //config: Awk is used as a pattern scanning and processing language. |
diff --git a/editors/cmp.c b/editors/cmp.c index b89e519ad..54f347508 100644 --- a/editors/cmp.c +++ b/editors/cmp.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | //config:config CMP | 9 | //config:config CMP |
10 | //config: bool "cmp (4.9 kb)" | 10 | //config: bool "cmp (5.3 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: cmp is used to compare two files and returns the result | 13 | //config: cmp is used to compare two files and returns the result |
diff --git a/editors/ed.c b/editors/ed.c index 4a84f7433..8ec23d07f 100644 --- a/editors/ed.c +++ b/editors/ed.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * The "ed" built-in command (much simplified) | 7 | * The "ed" built-in command (much simplified) |
8 | */ | 8 | */ |
9 | //config:config ED | 9 | //config:config ED |
10 | //config: bool "ed (21 kb)" | 10 | //config: bool "ed (16 kb)" |
11 | //config: default y | 11 | //config: default y |
12 | //config: help | 12 | //config: help |
13 | //config: The original 1970's Unix text editor, from the days of teletypes. | 13 | //config: The original 1970's Unix text editor, from the days of teletypes. |
diff --git a/editors/patch.c b/editors/patch.c index f90d6854d..5a768b23f 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * [file] which file to patch | 21 | * [file] which file to patch |
22 | */ | 22 | */ |
23 | //config:config PATCH | 23 | //config:config PATCH |
24 | //config: bool "patch (9.4 kb)" | 24 | //config: bool "patch (9.6 kb)" |
25 | //config: default y | 25 | //config: default y |
26 | //config: help | 26 | //config: help |
27 | //config: Apply a unified diff formatted patch. | 27 | //config: Apply a unified diff formatted patch. |
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c index 5478ece7d..c0631d8cd 100644 --- a/editors/patch_toybox.c +++ b/editors/patch_toybox.c | |||
@@ -26,7 +26,7 @@ | |||
26 | USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN)) | 26 | USE_PATCH(NEWTOY(patch, USE_TOYBOX_DEBUG("x")"up#i:R", TOYFLAG_USR|TOYFLAG_BIN)) |
27 | 27 | ||
28 | config PATCH | 28 | config PATCH |
29 | bool "patch (9.4 kb)" | 29 | bool "patch (9.6 kb)" |
30 | default y | 30 | default y |
31 | help | 31 | help |
32 | usage: patch [-i file] [-p depth] [-Ru] | 32 | usage: patch [-i file] [-p depth] [-Ru] |
diff --git a/editors/vi.c b/editors/vi.c index 74028e2b4..b49d5454d 100644 --- a/editors/vi.c +++ b/editors/vi.c | |||
@@ -18,7 +18,7 @@ | |||
18 | // An "ex" line oriented mode- maybe using "cmdedit" | 18 | // An "ex" line oriented mode- maybe using "cmdedit" |
19 | 19 | ||
20 | //config:config VI | 20 | //config:config VI |
21 | //config: bool "vi (23 kb)" | 21 | //config: bool "vi (26 kb)" |
22 | //config: default y | 22 | //config: default y |
23 | //config: help | 23 | //config: help |
24 | //config: 'vi' is a text editor. More specifically, it is the One True | 24 | //config: 'vi' is a text editor. More specifically, it is the One True |