Merge pull request #1 from circleci/master

[pull] master from circleci:master

jekyll/_cci2/contexts.md

@@ -121,12 +121,12 @@ If you move your repository to a new organization, you must also have the contex
 
 When creating contexts/environment variables, please note the following:
 
-- The context name must be 200 or fewer characters, must contain at least one non-whitespace character, and must not contain leading, trailing or vertical whitespaces.
-- Each organization is limited to 500 contexts.
-- The environment variable name must be 300 or fewer characters, beging with alpha or `_` as the first character, and use alphanumeric or `_` for the remaining characters.
+- The context name must be 200 or fewer characters, must contain at least one non-whitespace character, and must not contain leading, trailing or vertical whitespace.
+- The environment variable name must be 300 or fewer characters, begin with alpha or `_` as the first character, and use alphanumeric or `_` for the remaining characters.
 - An environment variable value must have 32k or fewer characters. 
 - An empty environment variable is considered valid.
 - Each context is limited to 100 environment variables.
+- Each organization is limited to 500 contexts.
 
 ## Combining contexts
 

jekyll/_cci2/local-cli.md

@@ -352,7 +352,9 @@ installations of CircleCI. To install the legacy CLI on macOS and other Linux Di
 1. Install and configure Docker by using the [docker installation instructions](https://docs.docker.com/install/).
 2. To install the CLI, run the following command:
 
-`$ curl -o /usr/local/bin/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci && chmod +x /usr/local/bin/circleci`
+```sh
+$ curl -o /usr/local/bin/circleci https://circle-downloads.s3.amazonaws.com/releases/build_agent_wrapper/circleci && chmod +x /usr/local/bin/circleci
+```
 
 The CLI, `circleci`, is downloaded to the `/usr/local/bin` directory. If you do not have write permissions for `/usr/local/bin`, you might need to run the above commands with `sudo`. The CLI automatically checks for updates and will prompt you if one is available.
 

jekyll/_cci2/v.2.19-overview.adoc

@@ -42,6 +42,11 @@ TIP: For more information on SSH reruns in Server installations, see the https:/
 
 * Classic Load Balancer is no longer available from v2.19.02 due to the ciphersuite changes listed in the notes below. CircleCI no longer accepts requests from https://docs.aws.amazon.com/elasticloadbalancing/latest/classic/elb-ssl-security-policy.html[Classic Load Balancer], so you should move to https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html[Network Load Balancer (NLB)] or https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html[Application Load Balancer (ALB)].
 
+## What's New in v2.19.12
+
+* Removed support for 1.0 builder graceful shutdown on auto-scaling events.
+  ** This alleviates Python 2 security vulnerabilities.
+
 ## What's New in v2.19.11
 
 * Fixed a bug that didn't allow more than 50 aliases in a configuration.

jekyll/_config.yml

@@ -64,7 +64,7 @@ asciidoctor:
     imagesdir: /docs/assets/img/docs/
     relfileprefix: ../
     outfilesuffix: /index.html
-    serverversion: 2.19.11
+    serverversion: 2.19.12
 
 collections:
   # this is named with an underscore because it needs to be processed

scripts/build_pdfs_asciidoc.sh

@@ -4,7 +4,7 @@ OUT_DIR="release/tmp"
 
 DATE=$(date +"%m/%d/%Y")
 
-VERSION="2.19.11"
+VERSION="2.19.12"
 
 COMMENT="FINAL"