diff options
author | Zuul <zuul@review.opendev.org> | 2020-02-04 15:38:15 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-02-04 15:38:15 +0000 |
commit | 29b0e366ab1360683512bc295b292ad6fe250b33 (patch) | |
tree | 32d58f91d1af3af2299e6d9f031d0f71d0dbe7c8 | |
parent | dc83d5161fd58c22018c0355282f98c9c2369035 (diff) | |
parent | d69208c0c460e7bb12e7c6bccc4c1ae0c8aa5cad (diff) | |
download | python-jenkins-job-builder-29b0e366ab1360683512bc295b292ad6fe250b33.tar.gz python-jenkins-job-builder-29b0e366ab1360683512bc295b292ad6fe250b33.tar.xz python-jenkins-job-builder-29b0e366ab1360683512bc295b292ad6fe250b33.zip |
Merge "Fix some typos in documentation"
-rw-r--r-- | doc/source/definition.rst | 4 | ||||
-rwxr-xr-x | jenkins_jobs/modules/publishers.py | 2 | ||||
-rw-r--r-- | jenkins_jobs/modules/wrappers.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/definition.rst b/doc/source/definition.rst index 6e63f83d..978d620b 100644 --- a/doc/source/definition.rst +++ b/doc/source/definition.rst @@ -577,7 +577,7 @@ and replace them with the empty string instead. Refer to :ref:`default-values` for details on setting variable defaults. -Variable Inheritence +Variable Inheritance ^^^^^^^^^^^^^^^^^^^^ It is possible in JJB to define defaults for variables at different levels such @@ -624,7 +624,7 @@ When a project wants to use a job-template it can use override it as follows: This is the standard way that most folks use and it will set ``branch: master`` for every job-template in the list. However sometimes we may want to provide an alternative value for a specific job in the list. In this case the more -specific declaration takes precendence: +specific declaration takes precedence: .. code-block:: yaml diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py index 6f770762..f2a8ef5b 100755 --- a/jenkins_jobs/modules/publishers.py +++ b/jenkins_jobs/modules/publishers.py @@ -7451,7 +7451,7 @@ def slack(registry, xml_parent, data): (>=2.0). (default false) :arg bool notify-failure: Send notification when job fails for the first time (previous build was a success) (>=2.0). (default false) - :arg bool notify-every-failure: Send notification everytime a job fails + :arg bool notify-every-failure: Send notification every time a job fails (>=2.23). (default false) :arg bool notify-back-to-normal: Send notification when job is succeeding again after being unstable or failed (>=2.0). (default false) diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index 09b9e2f4..ac8761d1 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -1590,7 +1590,7 @@ def sauce_ondemand(registry, xml_parent, data): to your private network (default false) :arg str sauce-host: The name of the selenium host to be used. For tests run using Sauce Connect, this should be localhost. - ondemand.saucelabs.com can also be used to conenct directly to + ondemand.saucelabs.com can also be used to connect directly to Sauce OnDemand, The value of the host will be stored in the SAUCE_ONDEMAND_HOST environment variable. (default '') :arg str sauce-port: The name of the Selenium Port to be used. For |