From bf8a631174ad266ee7a3451f022547e00df2444e Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Tue, 31 Jan 2017 12:11:20 -1000 Subject: [PATCH 1/2] Update faq.md Reduce RO sentences and minor cleanup. --- engine/faq.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/faq.md b/engine/faq.md index 523541269a..544e998553 100644 --- a/engine/faq.md +++ b/engine/faq.md @@ -22,7 +22,7 @@ We are using the Apache License Version 2.0, see it here: [https://github.com/docker/docker/blob/master/LICENSE]( https://github.com/docker/docker/blob/master/LICENSE) -### Does Docker run on macOS or Windows? +### Does Docker run on Linux, macOS or Windows? The Docker Engine client runs natively on Linux, macOS, and Windows. By default, these clients connect to a local Docker daemon running in a virtual environment managed @@ -47,23 +47,23 @@ lightweight and perfect as a unit of software delivery. ### What does Docker technology add to just plain LXC? -Docker technology is not a replacement for LXC. "LXC" refers to capabilities of +Docker technology is not a replacement for [LXC](https://linuxcontainers.org/). "LXC" refers to capabilities of the Linux kernel (specifically namespaces and control groups) which allow sandboxing processes from one another, and controlling their resource allocations. On top of this low-level foundation of kernel features, Docker offers a high-level tool with several powerful functionalities: - *Portable deployment across machines.* Docker defines a format for bundling - an application and all its dependencies into a single object which can be - transferred to any Docker-enabled machine, and executed there with the + an application and all its dependencies into a single object (called a container) which can be + transferred to any Docker-enabled machine. This container cab be executed there with the guarantee that the execution environment exposed to the application will be the - same. LXC implements process sandboxing, which is an important pre-requisite - for portable deployment, but that alone is not enough for portable deployment. + same in development, tesing, and production. LXC implements process sandboxing, which is an important pre-requisite + for portable deployment, but not enough for portable deployment. If you sent me a copy of your application installed in a custom LXC configuration, it would almost certainly not run on my machine the way it does - on yours, because it is tied to your machine's specific configuration: - networking, storage, logging, distro, etc. Docker defines an abstraction for - these machine-specific settings, so that the exact same Docker container can + on yours. The app you sent me is tied to your machine's specific configuration: + networking, storage, logging, etc. Docker defines an abstraction for + these machine-specific settings. The exact same Docker container can run - unchanged - on many different machines, with many different configurations. From 706c659f55ba5b25800296dd4a9646cf131c92f0 Mon Sep 17 00:00:00 2001 From: Rick Anderson Date: Tue, 31 Jan 2017 15:51:29 -1000 Subject: [PATCH 2/2] react to feedback --- engine/faq.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/faq.md b/engine/faq.md index 544e998553..7a2cec4ae8 100644 --- a/engine/faq.md +++ b/engine/faq.md @@ -22,7 +22,7 @@ We are using the Apache License Version 2.0, see it here: [https://github.com/docker/docker/blob/master/LICENSE]( https://github.com/docker/docker/blob/master/LICENSE) -### Does Docker run on Linux, macOS or Windows? +### Does Docker run on Linux, macOS, or Windows? The Docker Engine client runs natively on Linux, macOS, and Windows. By default, these clients connect to a local Docker daemon running in a virtual environment managed @@ -54,11 +54,11 @@ allocations. On top of this low-level foundation of kernel features, Docker offers a high-level tool with several powerful functionalities: - *Portable deployment across machines.* Docker defines a format for bundling - an application and all its dependencies into a single object (called a container) which can be - transferred to any Docker-enabled machine. This container cab be executed there with the + an application and all its dependencies into a single object called a container. This container can be + transferred to any Docker-enabled machine. The container can be executed there with the guarantee that the execution environment exposed to the application will be the same in development, tesing, and production. LXC implements process sandboxing, which is an important pre-requisite - for portable deployment, but not enough for portable deployment. + for portable deployment, but is not sufficient for portable deployment. If you sent me a copy of your application installed in a custom LXC configuration, it would almost certainly not run on my machine the way it does on yours. The app you sent me is tied to your machine's specific configuration: