diff --git a/ChangeLog-2014-12-10 b/ChangeLog-2014-12-10 index a48a868..65f6e92 100644 --- a/ChangeLog-2014-12-10 +++ b/ChangeLog-2014-12-10 @@ -729,7 +729,7 @@ * testenv/Makefile.am: Run the tests in Python's Optimizedmode * testenv/conf/__init__.py (gen_hook): Use try..except instead of if..else * testenv/misc/color_terminal.py: System and check will not change while a test is - run. Do not test for them on every invokation of printer() + run. Do not test for them on every invocation of printer() * testenv/server/http/http_server.py: The ssl and re modules are required by specific functions. Load them lazily (HTTPSServer.__init__): Lazy load ssl module here diff --git a/doc/wget.texi b/doc/wget.texi index 1e55e63..f6f0fbc 100644 --- a/doc/wget.texi +++ b/doc/wget.texi @@ -802,7 +802,7 @@ With @samp{--progress=bar}, there are currently two possible parameters, @var{force} and @var{noscroll}. When the output is not a TTY, the progress bar always falls back to ``dot'', -even if @samp{--progress=bar} was passed to Wget during invokation. This +even if @samp{--progress=bar} was passed to Wget during invocation. This behaviour can be overridden and the ``bar'' output forced by using the ``force'' parameter as @samp{--progress=bar:force}. diff --git a/src/main.c b/src/main.c index e7d5c66..a5617da 100644 --- a/src/main.c +++ b/src/main.c @@ -809,7 +809,7 @@ HTTPS (SSL/TLS) options:\n"), N_("\ --pinnedpubkey=FILE/HASHES Public key (PEM/DER) file, or any number\n\ of base64 encoded sha256 hashes preceded by\n\ - \'sha256//\' and seperated by \';\', to verify\n\ + \'sha256//\' and separated by \';\', to verify\n\ peer against\n"), #if defined(HAVE_LIBSSL) || defined(HAVE_LIBSSL32) N_("\ diff --git a/src/options.h b/src/options.h index a8c494b..85d2de1 100644 --- a/src/options.h +++ b/src/options.h @@ -243,7 +243,7 @@ struct options char *pinnedpubkey; /* Public key (PEM/DER) file, or any number of base64 encoded sha256 hashes preceded by - \'sha256//\' and seperated by \';\', to verify + \'sha256//\' and separated by \';\', to verify peer against */ char *random_file; /* file with random data to seed the PRNG */ diff --git a/testenv/README b/testenv/README index 3fee6ad..86c0d74 100644 --- a/testenv/README +++ b/testenv/README @@ -130,12 +130,12 @@ The rules object is a dictionary element, with the key as the Rule Name and value as the Rule Data. In most cases, the Rule Data is another dictionary. Various variables used consistently across all tests are: - * WGET_OPTIONS: The command line string passed to Wget upon invokation. This + * WGET_OPTIONS: The command line string passed to Wget upon invocation. This string may contain URLs, like in the case where in-URL authentication is used. Variable names passed like {{var_name}} will be replaced by the contents of the variable self.var_name before being passed to Wget * WGET_URLS: This is a list of filenames which will be appended as the URLs - to Wget during invokation. This is a list of lists, where WGET_URLS[0] + to Wget during invocation. This is a list of lists, where WGET_URLS[0] represents the list of Filenames called from Server[0], WGET_URLS[1] is a list of files downloaded from Server[2], etc. * Files: This variable defines the files that exist in the Server's @@ -215,7 +215,7 @@ executed. The currently supported options are: download. The complete URL will be created and passed to Wget automatically. (alias URLs) * WgetCommands : A string consisting of the various commandline switches - sent to Wget upon invokation. Any data placed between {{ }} in this string + sent to Wget upon invocation. Any data placed between {{ }} in this string will be replaced with the contents of self. before being passed to Wget. This is particularly useful for getting the hostname and port for a file. While all Download URL's are passed to Urls, a notable exception is diff --git a/testenv/conf/wget_commands.py b/testenv/conf/wget_commands.py index 2b7522e..fb379be 100644 --- a/testenv/conf/wget_commands.py +++ b/testenv/conf/wget_commands.py @@ -2,7 +2,7 @@ from conf import hook """ Pre-Test Hook: WgetCommands This hook is used to specify the test specific switches that must be passed to -wget on invokation. Default switches are hard coded in the test suite itself. +wget on invocation. Default switches are hard coded in the test suite itself. """