From c9ea32ad8b9f1f7accb930cc72518e5b6c406d09 Mon Sep 17 00:00:00 2001 From: moxiegirl Date: Mon, 13 Jul 2015 10:01:38 -0700 Subject: [PATCH 1/3] Updating text Updating the text --- site/layouts/index.html | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/site/layouts/index.html b/site/layouts/index.html index 34621f07cd..807da251fd 100755 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -28,12 +28,12 @@
-

What's in the box?

+

What's in the toolbox?

-

Docker Client + Engine

+

Docker Engine

Creates and runs Docker containers.

@@ -41,14 +41,14 @@

Docker Machine

-

Automatic Docker provisioning.

+

Provisions Docker to local or remote machines.

Docker Compose

-

Define multi-container applications.

+

Define multi-container applications. (Mac OS X only)

@@ -70,7 +70,7 @@
-

Get started with Docker from tutorials.

+

Choose a path to get started.

New to Docker Already Using Docker @@ -83,33 +83,39 @@
-

I already use boot2docker. How do I migrate to using machine in Docker Toolbox?

+

I already use Boot2Docker. How do I migrate my existing VMs to Docker Machine management?

- To migrate from boot2docker to Docker machine, please type the following command in your terminal: + To migrate a VM name boot2docker-vmfrom Boot2Docker to Docker Machine, please type the following command in your terminal:

- 
docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
+
    +
  1. Open a terminal or the Docker CLI on your system.
    2. +
  2. Type the following command.
    + 
    docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
    +
    3. +
  3. Use the docker-machine command to interact with the migrated VM.
    4. +

- The Docker machine command-line interface (CLI) is slightly different than the boot2docker CLI. - Please see the command comparison docs + The Docker Machine command-line interface (CLI) is slightly different than the Boot2Docker CLI. + Please see the command comparison docs for differences.

If you are still having trouble, please visit the full - boot2docker migration docs + boot2docker migration docs or file an issue on Github.

-

I've created a new virtual machine from Docker machine. Where did my old containers and images go?

+

I've created a new virtual machine from Docker Machine. Where did my old containers and images go?

- Docker Toolbox includes a tool called Docker machine, and it creates new and separate virtual machines (VM) from your old boot2docker VM. - Your old containers and images are still in the old boot2docker VM and are not lost. You can migrate your boot2docker VM to + Docker Toolbox includes a tool called Docker machine, and it creates new and separate virtual machines (VM) from your old Boot2Docker VM. + Your old containers and images are still in the old Boot2Docker VM and are not lost. You can migrate your Boot2Docker VM to machine by typing in the command in the previous Q&A.

From da43f8087d953a88f7f5013d6f1c0a888439d483 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 13 Jul 2015 10:44:45 -0700 Subject: [PATCH 2/3] Styled ordered list. --- site/layouts/index.html | 6 +++--- site/static/css/main.css | 22 ++++++++++++++++++++-- site/static/less/layout.less | 25 +++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/site/layouts/index.html b/site/layouts/index.html index 807da251fd..d573b253d3 100755 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -87,12 +87,12 @@

- To migrate a VM name boot2docker-vmfrom Boot2Docker to Docker Machine, please type the following command in your terminal: + To migrate a VM name boot2docker-vm from Boot2Docker to Docker Machine, please type the following command in your terminal:

  1. Open a terminal or the Docker CLI on your system.
    2. -
  2. Type the following command.
    - 
    docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
    +
  3. Type the following command.
    + 
    docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm
  4. Use the docker-machine command to interact with the migrated VM.
diff --git a/site/static/css/main.css b/site/static/css/main.css index af8e64dd99..7a17ac75f3 100755 --- a/site/static/css/main.css +++ b/site/static/css/main.css @@ -424,10 +424,28 @@ p { p strong { font-weight: 700; } +ol { + font-size: 1.2rem; + line-height: 1.7rem; + margin-bottom: 1rem; + margin-left: 1.8rem; +} +ol li { + list-style-type: decimal; + margin-bottom: 1rem; +} pre { border-radius: 0.3rem; - padding: 0.5rem; - margin-bottom: 1rem; + padding: 0.2rem 0.5rem; + display: inline-block; + font-size: 1rem; + font-family: Menlo, monospace; + color: #24b8eb; + background-color: rgba(36, 184, 235, 0.05); +} +code { + border-radius: 0.3rem; + padding: 0.2rem 0.5rem; display: inline-block; font-size: 1rem; font-family: Menlo, monospace; diff --git a/site/static/less/layout.less b/site/static/less/layout.less index 5c6cfed756..5cdbdf7495 100755 --- a/site/static/less/layout.less +++ b/site/static/less/layout.less @@ -286,10 +286,31 @@ p { } } +ol { + font-size: 1.2rem; + line-height: 1.7rem; + margin-bottom: 1rem; + margin-left: 1.8rem; + li { + list-style-type: decimal; + margin-bottom: 1rem; + } +} + pre { border-radius: 0.3rem; - padding: 0.5rem; - margin-bottom: 1rem; + padding: 0.2rem 0.5rem; + //margin-bottom: 1rem; + display: inline-block; + font-size: 1rem; + font-family: Menlo, monospace; + color: @brand-primary; + background-color: fade(@brand-primary, 5%); +} + +code { + border-radius: 0.3rem; + padding: 0.2rem 0.5rem; display: inline-block; font-size: 1rem; font-family: Menlo, monospace; From 35675727bf18c4778c2dd7021cb27dee3e309348 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 13 Jul 2015 11:57:29 -0700 Subject: [PATCH 3/3] Fixed copyright icon. --- site/config.toml | 1 - site/layouts/partials/footer.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/site/config.toml b/site/config.toml index 4bbf6a6fad..588f1011c6 100755 --- a/site/config.toml +++ b/site/config.toml @@ -2,7 +2,6 @@ baseurl = "https://toolbox.docker.com" languageCode = "en-us" title = "Docker Toolbox" author = "Sean Li" -copyright = "Copyright (c) 2015, Docker Inc." canonifyurls = true paginate = 3 diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html index 9af0b7fddb..d5da59f2e5 100755 --- a/site/layouts/partials/footer.html +++ b/site/layouts/partials/footer.html @@ -11,7 +11,7 @@
- {{.Site.Copyright}} + Copyright © 2015, Docker Inc.