Merge branch 'master' of https://github.com/circleci/circleci-docs into tjs/4679

Author: teesloane

jekyll/_cci2/add-ssh-key.md

@@ -4,6 +4,9 @@ title: "Adding an SSH Key to CircleCI"
 short-title: "Adding an SSH Key"
 description: "How to Add an SSH Key to CircleCI"
 order: 20
+version:
+- Cloud
+- Server v2.x
 ---
 
 If deploying to your servers requires SSH access,
@@ -20,10 +23,19 @@ to add SSH keys to CircleCI:
 If you are adding an SSH key for the first reason,
 refer to the [GitHub and Bitbucket Integration]({{ site.baseurl }}/2.0/gh-bb-integration/#enable-your-project-to-check-out-additional-private-repositories) document.
 Otherwise,
-follow the steps below to add an SSH key to your project.
+follow the steps below for the version of CircleCI you are using (Cloud/Server) to add an SSH key to your project.
 
 ## Steps
 
+**Note:**
+Since CircleCI cannot decrypt SSH keys,
+every new key must have an empty passphrase.
+CircleCI also will not accept OpenSSH's default file format - use `ssh-keygen -m pem` if you are using OpenSSH to generate your key. 
+
+**Caution:** Recent updates in `ssh-keygen` don't generate the key in PEM format by default. If your private key does not start with `-----BEGIN RSA PRIVATE KEY-----`, enforce PEM format by generating the key with `ssh-keygen -m PEM -t rsa -C "[email protected]"`
+
+### CircleCI Cloud
+
 1. In a terminal, generate the key with `ssh-keygen -m PEM -t rsa -C "[email protected]"`. See the [(SSH) Secure Shell documentation](https://www.ssh.com/ssh/keygen/) web site for additional details.
 
 2. In the CircleCI application,
@@ -48,13 +60,29 @@ you are adding.
 
 8. Click the **Add SSH Key** button.
 
-**Note:**
-Since CircleCI cannot decrypt SSH keys,
-every new key must have an empty passphrase.
-CircleCI also will not accept OpenSSH's default file format - use `ssh-keygen -m pem` if you are using OpenSSH to generate your key. 
+### CircleCI Server
 
-**Caution:** Recent updates in `ssh-keygen` don't generate the key in PEM format by default. If your private key does not start with `-----BEGIN RSA PRIVATE KEY-----`, enforce PEM format by generating the key with `ssh-keygen -m PEM -t rsa -C "[email protected]"`
+1. In a terminal, generate the key with `ssh-keygen -m PEM -t rsa -C "[email protected]"`. See the [(SSH) Secure Shell documentation](https://www.ssh.com/ssh/keygen/) web site for additional details.
+
+2. In the CircleCI application,
+go to your project's settings
+by clicking the gear icon next to your project.
+
+2. In the **Permissions** section,
+click on **SSH Permissions**.
+
+3. Click the **Add SSH Key** button.
+
+4. In the **Hostname** field,
+enter the key's associated host (for example, "git.heroku.com").
+If you don't specify a hostname,
+the key will be used for all hosts.
+
+5. In the **Private Key** field,
+paste the SSH key
+you are adding.
 
+6. Click the **Add SSH Key** button.
 
 ## Adding SSH Keys to a Job
 

jekyll/_cci2/admin-faq.adoc

@@ -1,3 +1,8 @@
+---
+version:
+- Server v2.x
+- Admin
+---
 = Frequently Asked Questions
 :page-layout: classic-docs
 :page-liquid:

jekyll/_cci2/api-developers-guide.md

@@ -5,6 +5,8 @@ short-title: "Developer's Guide"
 description: "API cookbook for internal and external CircleCI developers"
 categories: [getting-started]
 order: 1
+version:
+- Cloud
 ---
 
 This *API Developer's Guide* was written to assist developers in quickly and easily making API calls to CircleCI services to return detailed information about users, pipelines, projects and workflows.

jekyll/_cci2/api-intro.md

@@ -5,14 +5,16 @@ short-title: "API Reference"
 description: "Introduction to the CircleCI API"
 categories: [getting-started]
 order: 1
+version:
+- Cloud
 ---
 
 The CircleCI API may be used to make API calls to retrieve detailed information about users, jobs, workflows and pipelines. There are currently two supported API versions:
 
 * [API v1.1 Reference](https://circleci.com/docs/api/v1/)
 * [API v2 Reference](https://circleci.com/docs/api/v2/)
 
-API v2 includes several powerful features (e.g. support for pipelines and pipeline parameters) that are unavailable in API v1.1. It is recommended that users migrate their scripts to API v2 stable endpoints as soon as possible. 
+API v2 includes several powerful features (e.g. support for pipelines and pipeline parameters) that are unavailable in API v1.1. It is recommended that CircleCI Cloud users migrate their scripts to API v2 stable endpoints as soon as possible. 
 
 CircleCI API v1.1 and portions of API v2 are supported and generally available. CircleCI expects to eventually End-Of-Life (EOL) API v1.1 in favor of API v2 as more API v2 endpoints are announced as stable. Further guidance on when CircleCI API v1.1 will be discontinued will be communicated at a future date.
 

jekyll/_cci2/api-job-trigger.md

@@ -5,6 +5,9 @@ short-title: "Using the API to Trigger Jobs"
 description: "How to define and trigger non-build jobs"
 categories: [configuring-jobs]
 order: 80
+version:
+- Cloud
+- Server v2.x
 ---
 
 

jekyll/_cci2/arch_components.png

@@ -1,3 +1,7 @@
+---
+version:
+- Server v2.x
+---
 = CircleCI Server Container Architecture
 :page-layout: classic-docs
 :page-liquid:

jekyll/_cci2/arch_server.png

@@ -3,6 +3,9 @@ layout: classic-docs
 title: Upload to Artifactory
 categories: [how-to]
 description: How to upload Artifacts to Artifactory in CircleCI
+version:
+- Cloud
+- Server v2.x
 ---
 
 CircleCI supports uploading directly to Artifactory.
@@ -14,9 +17,9 @@ CircleCI supports uploading directly to Artifactory.
 
 Artifactory has great documentation explaining how to leverage their [REST API](https://www.jfrog.com/confluence/display/RTF/Artifactory+REST+API).
 
-We'll use this space to highlight some sample projects showing how to best leverage CircleCI and Artifactory together.
+We will use this space to highlight some sample projects showing how to best use CircleCI and Artifactory together.
 
-Ensure that you've created your repository before starting this example, otherwise CircleCI won't have a place to store your dependencies.
+Ensure that you have created your repository before starting this example, otherwise CircleCI won't have a place to store your dependencies.
 
 ## Artifactory Plugins
 Popular tools like Maven and Gradle have Artifactory plugins, and can deploy to Artifactory using their respective deploy commands.
@@ -37,23 +40,23 @@ If you want to use the JFrog CLI, you can install it by adding the following to
 Now we need to configure JFrog to use our credentials securely. We configure the client to use our `$ARTIFACTORY_URL`, along with our `$ARTIFACTORY_USER` and `$ARTIFACTORY_APIKEY`. These can be entered under `Project Settings->Environment Variables`
 
 ```
-    - run: ./jfrog rt config --url $ARTIFACTORY_URL --user $ARTIFACTORY_USER --apikey $ARTIFACTORY_APIKEY --interactive=false
+- run: ./jfrog rt config --url $ARTIFACTORY_URL --user $ARTIFACTORY_USER --apikey $ARTIFACTORY_APIKEY --interactive=false
 
 ```
 
-If you'd like to upload JAR files use the following example:
+If you would like to upload JAR files use the following example:
 
 ```
-    - run: ./jfrog rt u "multi*/*.jar" <artifactory_repo_name> --build-name=<name_you_give_to_build> --build-number=$CIRCLE_BUILD_NUM --flat=false
+- run: ./jfrog rt u "multi*/*.jar" <artifactory_repo_name> --build-name=<name_you_give_to_build> --build-number=$CIRCLE_BUILD_NUM --flat=false
 ```
 
-If you'd like to upload WAR files use the following example:
+If you would like to upload WAR files use the following example:
 
 ```
-    - run: ./jfrog rt u "multi*/*.war" <artifactory_repo_name> --build-name=<name_you_give_to_build> --build-number=$CIRCLE_BUILD_NUM --flat=false
+- run: ./jfrog rt u "multi*/*.war" <artifactory_repo_name> --build-name=<name_you_give_to_build> --build-number=$CIRCLE_BUILD_NUM --flat=false
 ```
 
-The full .circleci/config.yml file would look something like the following:
+The full `.circleci/config.yml` file would look something like the following:
 
 ```yaml
 version: 2

jekyll/_cci2/architecture.adoc

@@ -5,6 +5,9 @@ short-title: "Storing Build Artifacts"
 description: "Example of uploading artifacts created during a build"
 categories: [configuring-jobs]
 order: 70
+version:
+- Cloud
+- Server v2.x
 ---
 
 This document describes how to work with Artifacts in the following sections:

jekyll/_cci2/artifactory.md

@@ -1,3 +1,8 @@
+---
+version:
+- Server v2.x
+- Server Admin
+---
 = Authentication
 :page-layout: classic-docs
 :page-liquid:

jekyll/_cci2/artifacts.md

@@ -1,3 +1,7 @@
+---
+version:
+- Server v2.x
+---
 = Installation Prerequisites
 :page-layout: classic-docs
 :page-liquid:

jekyll/_cci2/authentication.adoc

@@ -1,3 +1,7 @@
+---
+version:
+- Server v2.x
+---
 = Teardown
 :page-layout: classic-docs
 :page-liquid: