diff --git a/ChangeLog.txt b/ChangeLog.txt index ecdd465..f2d12ef 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -166,8 +166,8 @@ Merged 221: Add convenience 'uninstall' target - BUG FIX: gflags_nothreads was linking against the wrong lib (ajenjo) - BUG FIX: threads-detection failed on FreeBSD; replace it (ajenjo) - PORTABILITY: Quiet an internal compiler error with SUSE 10 (csilvers) -- PORTABILITY: Update deb.sh for more recenty debuilds (csilvers) -- PORTABILITY: #include more headers to satify new gcc's (csilvers) +- PORTABILITY: Update deb.sh for more recently debuilds (csilvers) +- PORTABILITY: #include more headers to satisfy new gcc's (csilvers) - INSTALL: Updated to autoconf 2.61 and libtool 1.5.26 (csilvers) * Fri Oct 3 2008 - Google Inc. diff --git a/README.md b/README.md index 10f8c6f..f770c1c 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ gflags is written in C++ only. This release also marks the complete move of the gflags project from Google Code to GitHub. Email addresses of original issue reporters got lost in the process. Given the age of most issue reports, -this should be negligable. +this should be negligible. Please report any further issues using the GitHub issue tracker. diff --git a/doc/index.html b/doc/index.html index 17aa507..3ff7563 100644 --- a/doc/index.html +++ b/doc/index.html @@ -469,7 +469,7 @@ the application to print some information about itself and exit.

shows all flags from all files, sorted by file and then by name; shows the flagname, its default value, and its help string - --helpfull + --helpful same as -help, but unambiguously asks for all flags (in case -help changes in the future) diff --git a/src/gflags_completions.cc b/src/gflags_completions.cc index 4f7bb78..86df022 100644 --- a/src/gflags_completions.cc +++ b/src/gflags_completions.cc @@ -39,10 +39,10 @@ // 2a) If there are no matching flags, do nothing. // 2b) If all matching flags share a common prefix longer than the // completion word, output just that matching prefix -// 3) Categorize those flags to produce a rough ordering of relevence. +// 3) Categorize those flags to produce a rough ordering of relevance. // 4) Potentially trim the set of flags returned to a smaller number // that bash is happier with -// 5) Output the matching flags in groups ordered by relevence. +// 5) Output the matching flags in groups ordered by relevance. // 5a) Force bash to place most-relevent groups at the top of the list // 5b) Trim most flag's descriptions to fit on a single terminal line @@ -170,7 +170,7 @@ static string GetLongFlagLine( // most likely to be useful first. If this is set, however, the user // really does want us to return every single flag as an option. // - force_no_update: Any time we output lines, all of which share a -// common prefix, bash will 'helpfully' not even bother to show the +// common prefix, bash will 'helpfuly' not even bother to show the // output, instead changing the current word to be that common prefix. // If it's clear this shouldn't happen, we'll set this boolean struct CompletionOptions { @@ -188,7 +188,7 @@ struct CompletionOptions { // Notable flags are flags that are special or preferred for some // reason. For example, flags that are defined in the binary's module -// are expected to be much more relevent than flags defined in some +// are expected to be much more relevant than flags defined in some // other random location. These sets are specified roughly in precedence // order. Once a flag is placed in one of these 'higher' sets, it won't // be placed in any of the 'lower' sets. @@ -410,7 +410,7 @@ static bool DoesSingleFlagMatch( // 3) Categorize matches (and helper method) // Given a set of matching flags, categorize them by -// likely relevence to this specific binary +// likely relevance to this specific binary static void CategorizeAllMatchingFlags( const set &all_matches, const string &search_token, diff --git a/src/gflags_completions.h.in b/src/gflags_completions.h.in index b27e5fd..177b8d2 100644 --- a/src/gflags_completions.h.in +++ b/src/gflags_completions.h.in @@ -45,7 +45,7 @@ // handling. // // ** Overview of Bash completions: -// Bash can be told to programatically determine completions for the +// Bash can be told to programmatically determine completions for the // current 'cursor word'. It does this by (in this case) invoking a // command with some additional arguments identifying the command // being executed, the word being completed, and the previous word @@ -63,7 +63,7 @@ // we'll include the default flag value and as much of the flag's // description as can fit on a single terminal line width, as specified // by the flag --tab_completion_columns). Furthermore, we'll try to -// make bash order the output such that the most useful or relevent +// make bash order the output such that the most useful or relevant // flags are the most likely to be shown at the top. // // ** Additional features: diff --git a/src/gflags_reporting.cc b/src/gflags_reporting.cc index db05303..665162a 100644 --- a/src/gflags_reporting.cc +++ b/src/gflags_reporting.cc @@ -63,7 +63,7 @@ // The 'reporting' flags. They all call gflags_exitfunc(). DEFINE_bool (help, false, "show help on all flags [tip: all flags can have two dashes]"); -DEFINE_bool (helpfull, false, "show help on all flags -- same as -help"); +DEFINE_bool (helpful, false, "show help on all flags -- same as -help"); DEFINE_bool (helpshort, false, "show help on only the main module for this program"); DEFINE_string(helpon, "", "show help on the modules named by this flag value"); DEFINE_string(helpmatch, "", "show help on modules whose name contains the specified substr"); @@ -383,7 +383,7 @@ void HandleCommandLineHelpFlags() { ShowUsageWithFlagsMatching(progname, substrings); gflags_exitfunc(1); - } else if (FLAGS_help || FLAGS_helpfull) { + } else if (FLAGS_help || FLAGS_helpful) { // show all options ShowUsageWithFlagsRestrict(progname, ""); // empty restrict gflags_exitfunc(1); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4cd1e69..7bb3971 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -77,8 +77,8 @@ add_gflags_test(changeable_string_var 1 "-changeable_string_var () type: string add_gflags_test(nohelp 0 "PASS" "" gflags_unittest --nohelp) add_gflags_test(help=false 0 "PASS" "" gflags_unittest --help=false) -# --helpfull is the same as help -add_gflags_test(helpfull 1 "${SLASH}gflags_reporting.cc:" "" gflags_unittest --helpfull) +# --helpful is the same as help +add_gflags_test(helpful 1 "${SLASH}gflags_reporting.cc:" "" gflags_unittest --helpful) # --helpshort should show only flags from the gflags_unittest itself add_gflags_test(helpshort 1 "${SLASH}gflags_unittest.cc:" "${SLASH}gflags_reporting.cc:" gflags_unittest --helpshort) @@ -140,8 +140,8 @@ add_gflags_test(fromenv=version 0 "gflags_unittest" "${SLASH}gflags_unittes add_gflags_test(tryfromenv=version 0 "gflags_unittest" "${SLASH}gflags_unittest.cc:" gflags_unittest --tryfromenv=version) add_gflags_test(fromenv=help 0 "PASS" "" gflags_unittest --fromenv=help) add_gflags_test(tryfromenv=help 0 "PASS" "" gflags_unittest --tryfromenv=help) -add_gflags_test(fromenv=helpfull 1 "helpfull not found in environment" "" gflags_unittest --fromenv=helpfull) -add_gflags_test(tryfromenv=helpfull 0 "PASS" "" gflags_unittest --tryfromenv=helpfull) +add_gflags_test(fromenv=helpful 1 "helpful not found in environment" "" gflags_unittest --fromenv=helpful) +add_gflags_test(tryfromenv=helpful 0 "PASS" "" gflags_unittest --tryfromenv=helpful) add_gflags_test(tryfromenv=undefok 0 "PASS" "" gflags_unittest --tryfromenv=undefok --foo) add_gflags_test(tryfromenv=weirdo 1 "unknown command line flag" "" gflags_unittest --tryfromenv=weirdo) add_gflags_test(tryfromenv-multiple 0 "gflags_unittest" "${SLASH}gflags_unittest.cc:" gflags_unittest --tryfromenv=test_bool,version,unused_bool)