From dc757e1ab24c2d99258b46bb604d1db0fc37ce1d Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Wed, 26 Sep 2018 18:24:20 +0530 Subject: [PATCH] Fix typos in docs Change-Id: I1a12cebe248c368bab73abd50cc5045214435b8f Signed-off-by: Anil Belur --- docs/best-practices.rst | 4 ++-- docs/jjb/lf-ci-jobs.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/best-practices.rst b/docs/best-practices.rst index 2ea7ab93..85ee7f7d 100644 --- a/docs/best-practices.rst +++ b/docs/best-practices.rst @@ -329,7 +329,7 @@ In this case there is a default '{message}' set in the If we do not declare a default in the :ref:`job-template ` then JJB will fallback to checking the "defaults configuration". -This means that the precendence of defaults is as follows: +This means that the precedence of defaults is as follows: 1. User-provided 2. Job Template @@ -372,7 +372,7 @@ Variable expansion order of precedence seems to be: global-jjb should not provide job-group definitions and leave it up to users of global-jjb to create their own as a job-group as a variable defined in a job -group the highest precendence. Global JJB should strive to be purely a +group the highest precedence. Global JJB should strive to be purely a job-template and macro library for downstream consumers. Final thoughts diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 6a8caff6..b2905f35 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -138,7 +138,7 @@ Typically this template is automatically pulled in by the "{project-name}-ci-jobs" job-group and does not need to be explicitly called if the job group is being used. -Miniaml Example: +Minimal Example: .. literalinclude:: ../../.jjb-test/lf-ci-jobs/jenkins-cfg-merge-minimal.yaml :language: yaml @@ -205,7 +205,7 @@ configuration in the format ``KEY=value``. (default: "os-cloud") :INSTANCE_CAP: Total number of instances the cloud will allow spin up. (default: null) - :SANDBOX_CAP: Total number of instances the clodu will allow to + :SANDBOX_CAP: Total number of instances the cloud will allow to spin up. This applies to "sandbox" systems and overrides the INSTANCE_CAP setting. (default: null) -- 2.16.6