diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index 575808e1..1c1c2b2d 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle @@ -4,7 +4,7 @@ with others. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/CodingStyle -In addtion to Linux coding style this project has few addtional +In addtion to Linux coding style this project has few additional wishes to contributors. * Many small patches are favoured over one big. Break down is done on diff --git a/ps/output.c b/ps/output.c index f97fa63e..0b030670 100644 --- a/ps/output.c +++ b/ps/output.c @@ -2024,7 +2024,7 @@ void init_output(void){ ); memset(outbuf, ' ', SPACE_AMOUNT); if(SPACE_AMOUNT==page_size) mprotect(outbuf, page_size, PROT_READ); - mprotect(outbuf + page_size*outbuf_pages, page_size, PROT_NONE); // gaurd page + mprotect(outbuf + page_size*outbuf_pages, page_size, PROT_NONE); // guard page saved_outbuf = outbuf + SPACE_AMOUNT; // available space: page_size*outbuf_pages-SPACE_AMOUNT diff --git a/ps/parser.c b/ps/parser.c index 2c3ec034..0c0b4bd9 100644 --- a/ps/parser.c +++ b/ps/parser.c @@ -226,7 +226,7 @@ static const char *parse_sysv_option(void){ // "IEEE Std 1003.1, 2004 Edition", "ISO/IEC 9945:2003", // or "Version 2 of the Single Unix Specification". // - // It may be time to re-think the existance of this list. + // It may be time to re-think the existence of this list. // In the meantime, please do not add to it. The list is // intended to ONLY contain flags defined by the POSIX and UNIX // standards published by The Open Group, IEEE, and ISO. diff --git a/ps/ps.1 b/ps/ps.1 index 5dce40d7..e251b02d 100644 --- a/ps/ps.1 +++ b/ps/ps.1 @@ -1310,11 +1310,11 @@ for additional information. T} maj_flt MAJFLT T{ -The number of major page faults that have occured with this process. +The number of major page faults that have occurred with this process. T} min_flt MINFLT T{ -The number of minor page faults that have occured with this process. +The number of minor page faults that have occurred with this process. T} ni NI T{ diff --git a/testsuite/free.test/free.exp b/testsuite/free.test/free.exp index 1d5e8372..0aa008ef 100644 --- a/testsuite/free.test/free.exp +++ b/testsuite/free.test/free.exp @@ -51,8 +51,7 @@ set test "free with zero repeat count" spawn $free -c 0 expect_pass "$test" "\(lt-\)\?free: failed to parse count argument: '0': Numerical result out of range" -set test "free with postive repeat count" -set test "free with postive repeat count" +set test "free with positive repeat count" spawn $free -c 2 expect_continue "$test" "^${free_header}" expect_pass "$test" "${free_header}" diff --git a/top/README.top b/top/README.top index 78fee028..b5ffcf56 100644 --- a/top/README.top +++ b/top/README.top @@ -341,7 +341,7 @@ BENCHMARKS, Redux (for NLS) ============================================== Each test was run outside of X-windows at a linux console offering 48 rows and 170 columns. This was done to reduce - contention which sometimes made comparisions problematic. + contention which sometimes made comparisons problematic. old-top = procps-3.2.8 (debian patched and memory leaking) new-top = procps-ng-3.3.2 with NLS support diff --git a/top/top.c b/top/top.c index 41b69a7e..4e782749 100644 --- a/top/top.c +++ b/top/top.c @@ -112,7 +112,7 @@ static int No_ksyms = -1, // set to '0' if ksym avail, '1' otherwise Width_mode = 0; // set w/ 'w' - potential output override /* Unchangeable cap's stuff built just once (if at all) and - thus NOT saved in a WIN_t's RCW_t. To accomodate 'Batch' + thus NOT saved in a WIN_t's RCW_t. To accommodate 'Batch' mode, they begin life as empty strings so the overlying logic need not change ! */ static char Cap_clr_eol [CAPBUFSIZ] = "", // global and/or static vars @@ -1404,7 +1404,7 @@ static void build_headers (void) { #ifdef EQUCOLHDRYES // prepare to even out column header lengths... if (hdrmax + w->hdrcaplen < (x = strlen(w->columnhdr))) hdrmax = x - w->hdrcaplen; - // must sacrifice last header positon to avoid task row abberations + // must sacrifice last header position to avoid task row abberations w->eolcap = Caps_endline; #else if (Screen_cols > (int)strlen(w->columnhdr)) w->eolcap = Caps_endline; @@ -1454,7 +1454,7 @@ static void build_headers (void) { /* - * This guy coordinates the activities surounding the maintainence + * This guy coordinates the activities surrounding the maintainence * of each visible window's columns headers and the library flags * required for the openproc interface. */ static void calibrate_fields (void) { @@ -3259,7 +3259,7 @@ static void keys_xtra (int ch) { #else OFFw(w, Show_FOREST); #endif - /* these keys represent old-top compatability -- + /* these keys represent old-top compatibility -- they're grouped here so that if users could ever be weaned, we would just whack do_key's key_tab entry and this function... */ switch (ch) { diff --git a/top/top_nls.c b/top/top_nls.c index f4406adf..e31d4c4a 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -37,7 +37,7 @@ // comment additions. // // Also, by omitting the argument for the --add-comments - // XGETTEXT_OPTION in po/Makevars, *any* preceeding c style + // XGETTEXT_OPTION in po/Makevars, *any* preceding c style // comment will be propagated to the .pot file, providing // that the gettext macro isn't empty as discussed above. // However, this is far too aggressive so we have chosen diff --git a/vmstat.8 b/vmstat.8 index 38940bf5..6e7d4b7c 100644 --- a/vmstat.8 +++ b/vmstat.8 @@ -26,7 +26,7 @@ between updates in seconds. If no is specified, only one report is printed with the average values since boot. .TP .I count -Number of updates. In absense of +Number of updates. In absence of .IR count , when .I delay