re-formatted advisory blockquote, and added advisories to Toolbox docs

added kitematic advisories, and updated getting started instructions

incorporated Laura's comments apps --> applications

removed gradient on advisory blockquote because Netlify doesn't like it :-(

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2016-12-08 15:10:44 -08:00
parent f4008148de
commit f788509332
15 changed files with 34 additions and 22 deletions

View File

@ -12,6 +12,8 @@ texts:
rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available." rc: "The Swarm mode feature included in Docker Engine 1.12 is a release candidate feature and might be subject to non backward-compatible changes. Some functionality may change before the feature becomes generally available."
docker4mac-beta: "Docker for Mac is currently in public beta. Some functionality may change before the product becomes generally available." docker4mac-beta: "Docker for Mac is currently in public beta. Some functionality may change before the product becomes generally available."
docker4win-beta: "Docker for Windows is currently in public beta. Some functionality may change before the product becomes generally available." docker4win-beta: "Docker for Windows is currently in public beta. Some functionality may change before the product becomes generally available."
toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible."
kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications."
swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product."
swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. If you use Docker 1.12 or higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode &#8212; a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/) and [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. If you use Docker 1.12 or higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode &#8212; a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/) and [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands."
engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta." engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta."

View File

@ -205,7 +205,7 @@ ng\:form {
<div {% if page.notoc %} class="col-xs-12 col-sm-9 col-md-10" {% else %} class="col-xs-12 col-sm-9 col-md-8 col-xl-9" {% endif %} > <div {% if page.notoc %} class="col-xs-12 col-sm-9 col-md-10" {% else %} class="col-xs-12 col-sm-9 col-md-8 col-xl-9" {% endif %} >
<section class="section" id="DocumentationText"> <section class="section" id="DocumentationText">
{% if page.title %}<h1>{{ page.title }}</h1>{% endif %} {% if page.title %}<h1>{{ page.title }}</h1>{% endif %}
{% if page.advisory %}<blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>{% endif %} {% if page.advisory %}<blockquote style="border-left: 6px solid #FFD601;">{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>{% endif %}
{% include read_time.html %} {% include read_time.html %}
{{ content }} {{ content }}
{% if page.noratings != true %} {% if page.noratings != true %}

View File

@ -1,4 +1,5 @@
--- ---
advisory: kitematic
description: Documentation covering common questions users have about Kitematic description: Documentation covering common questions users have about Kitematic
keywords: docker, documentation, about, technology, kitematic, gui keywords: docker, documentation, about, technology, kitematic, gui
title: 'Kitematic: Frequently asked questions (FAQ)' title: 'Kitematic: Frequently asked questions (FAQ)'

View File

@ -1,9 +1,10 @@
--- ---
advisory: kitematic
description: Documentation that provides an overview of Kitematic and installation instructions description: Documentation that provides an overview of Kitematic and installation instructions
keywords: docker, documentation, about, technology, kitematic, gui keywords: docker, documentation, about, technology, kitematic, gui
title: Kitematic title: Kitematic
--- ---
Kitematic, the Docker GUI, runs on macOS and Windows operating systems. Beginning with the 1.8 Docker release, you use the Docker Toolbox to install Kitematic. See the [macOS installation guide](/docker-for-mac/) or the [Windows installation guide](/docker-for-windows/) for details on installing with Docker Toolbox. Kitematic, the Docker GUI, runs on Mac and Windows operating systems. Beginning with the 1.8 Docker release, you use the [Docker Toolbox](/toolbox/overview/) to install Kitematic.
For information about using Kitematic, take a look at the [User Guide](userguide.md). For information about using Kitematic, take a look at the [User Guide](userguide.md).

View File

@ -1,15 +1,14 @@
--- ---
advisory: kitematic
description: Information about known issues in Kitematic description: Information about known issues in Kitematic
keywords: docker, documentation, about, technology, kitematic, gui keywords: docker, documentation, about, technology, kitematic, gui
title: 'Kitematic: Known issues' title: 'Kitematic: Known issues'
--- ---
Kitematic is in beta, so we're still working out the kinks. The most common The most common errors with Kitematic occur at the setup stage since creating a
errors occur at the setup stage since creating a VM reliably with VirtualBox can VM reliably with VirtualBox can be tricky. We are working on this problem.
be tricky. We are working on this problem.
In the meantime, below are a list of common errors and solutions that work for Below are a list of common errors and solutions that work for most people.
most people.
## Setup Error or Hanging at 99% ## Setup Error or Hanging at 99%

View File

@ -1,4 +1,5 @@
--- ---
advisory: kitematic
description: Tutorial demonstrating the setup of a Minecraft server using Docker and Kitematic description: Tutorial demonstrating the setup of a Minecraft server using Docker and Kitematic
keywords: docker, documentation, about, technology, kitematic, gui, minecraft, tutorial keywords: docker, documentation, about, technology, kitematic, gui, minecraft, tutorial
title: 'Kitematic tutorial: Set up a Minecraft server' title: 'Kitematic tutorial: Set up a Minecraft server'

View File

@ -1,4 +1,5 @@
--- ---
advisory: kitematic
description: Tutorial demonstrating the setup of an Nginx web server using Docker and Kitematic description: Tutorial demonstrating the setup of an Nginx web server using Docker and Kitematic
keywords: docker, documentation, about, technology, kitematic, gui, nginx, tutorial keywords: docker, documentation, about, technology, kitematic, gui, nginx, tutorial
title: 'Kitematic tutorial: Serve a static website with NGINX' title: 'Kitematic tutorial: Serve a static website with NGINX'

View File

@ -1,4 +1,5 @@
--- ---
advisory: kitematic
description: Tutorial demonstrating the setup of an RethinkDB database for development description: Tutorial demonstrating the setup of an RethinkDB database for development
keywords: docker, documentation, about, technology, kitematic, gui, rethink, tutorial keywords: docker, documentation, about, technology, kitematic, gui, rethink, tutorial
title: 'Kitematic tutorial: Create a local RethinkDB database for development' title: 'Kitematic tutorial: Create a local RethinkDB database for development'

View File

@ -1,4 +1,5 @@
--- ---
advisory: kitematic
description: Documentation that provides an overview of Kitematic and installation instructions description: Documentation that provides an overview of Kitematic and installation instructions
keywords: docker, documentation, about, technology, kitematic, gui keywords: docker, documentation, about, technology, kitematic, gui
title: Kitematic user guide title: Kitematic user guide
@ -23,8 +24,7 @@ and configuring volumes. You can use Kitematic to change environment variables,
stream logs, and single click terminal into your Docker container all from the stream logs, and single click terminal into your Docker container all from the
GUI. GUI.
First, if you haven't yet done so, [download and start First, if you haven't yet done so, download and start Kitematic by installing [Docker Toolbox](/toolbox/overview.md#ready-to-get-started).
Kitematic](index.md).
## Container list ## Container list

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: FAQs, troubleshooting, and tips index for Toolbox installs description: FAQs, troubleshooting, and tips index for Toolbox installs
identifier: toolbox_overview_faqs identifier: toolbox_overview_faqs
keywords: docker, documentation, about, technology, kitematic, gui, toolbox keywords: docker, documentation, about, technology, kitematic, gui, toolbox

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: Troubleshooting connectivity and certificate issues description: Troubleshooting connectivity and certificate issues
keywords: beginner, getting started, FAQs, troubleshooting, Docker keywords: beginner, getting started, FAQs, troubleshooting, Docker
title: Troubleshooting title: Troubleshooting

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: Documentation that provides an overview of Docker Toolbox and installation instructions description: Documentation that provides an overview of Docker Toolbox and installation instructions
keywords: docker, documentation, about, technology, docker toolbox, gui keywords: docker, documentation, about, technology, docker toolbox, gui
title: Docker Toolbox title: Docker Toolbox

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: Documentation that provides an overview of Toolbox description: Documentation that provides an overview of Toolbox
keywords: docker, documentation, about, technology, kitematic, gui, toolbox keywords: docker, documentation, about, technology, kitematic, gui, toolbox
title: Docker Toolbox Overview title: Docker Toolbox Overview

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: How to install Toolbox on Mac description: How to install Toolbox on Mac
keywords: docker, documentation, install, toolbox, mac keywords: docker, documentation, install, toolbox, mac
title: Install Docker Toolbox on macOS title: Install Docker Toolbox on macOS

View File

@ -1,4 +1,5 @@
--- ---
advisory: toolbox
description: How to install Toolbox on Mac description: How to install Toolbox on Mac
keywords: docker, documentation, install, toolbox, win keywords: docker, documentation, install, toolbox, win
title: Install Docker Toolbox on Windows title: Install Docker Toolbox on Windows