Merge pull request #9859 from NateEag/patch-1

Grammar fix and style tweak in docs/sources/faq.md
This commit is contained in:
Fred Lifton 2014-12-31 11:58:49 -08:00
Родитель 880aeab00d 4e679f218c
Коммит 529011cf41
1 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -8,7 +8,7 @@ page_keywords: faq, questions, documentation, docker
### How much does Docker cost?
Docker is 100% free, it is open source, so you can use it without
Docker is 100% free. It is open source, so you can use it without
paying.
### What open source license are you using?
@ -19,12 +19,12 @@ https://github.com/docker/docker/blob/master/LICENSE)
### Does Docker run on Mac OS X or Windows?
Not at this time, Docker currently only runs on Linux, but you can use
VirtualBox to run Docker in a virtual machine on your box, and get the
best of both worlds. Check out the [*Mac OS X*](../installation/mac/#macosx)
and [*Microsoft Windows*](../installation/windows/#windows) installation
guides. The small Linux distribution boot2docker can be run inside virtual
machines on these two operating systems.
Docker currently runs only on Linux, but you can use VirtualBox to run
Docker in a virtual machine on your box, and get the best of both worlds.
Check out the [*Mac OS X*](../installation/mac/#macosx) and [*Microsoft
Windows*](../installation/windows/#windows) installation guides. The small
Linux distribution boot2docker can be run inside virtual machines on these
two operating systems.
### How do containers compare to virtual machines?