From 3754ad573754b8e1794217ebff9a7e1c656c8c2d Mon Sep 17 00:00:00 2001 From: Morgan Bauer Date: Fri, 24 Jul 2015 09:26:55 -0700 Subject: [PATCH] Fix FAQ links - don't use relative references '..' - registry-index-spec became hub-registry-spec - reference new 'glossary' instead of old 'terms' Signed-off-by: Morgan Bauer --- docs/misc/faq.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/misc/faq.md b/docs/misc/faq.md index 1c4164da44..70c270b99b 100644 --- a/docs/misc/faq.md +++ b/docs/misc/faq.md @@ -31,8 +31,8 @@ https://github.com/docker/docker/blob/master/LICENSE) 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 +[*Mac OS X*](/installation/mac/) and [*Microsoft +Windows*](/installation/windows/) installation guides. The small Linux distribution boot2docker can be run inside virtual machines on these two operating systems. @@ -77,7 +77,7 @@ with several powerful functionalities: - *Automatic build.* Docker includes [*a tool for developers to automatically assemble a container from their source - code*](../reference/builder/#dockerbuilder), with full control over application + code*](/reference/builder/), with full control over application dependencies, build tools, packaging etc. They are free to use `make`, `maven`, `chef`, `puppet`, `salt,` Debian packages, RPMs, source tarballs, or any combination of the above, regardless of the configuration of the machines. @@ -91,17 +91,17 @@ with several powerful functionalities: can be transferred by only sending diffs. - *Component re-use.* Any container can be used as a [*"base image"*]( - ../terms/image/#base-image-def) to create more specialized components. This can + /reference/glossary/#image) to create more specialized components. This can be done manually or as part of an automated build. For example you can prepare the ideal Python environment, and use it as a base for 10 different applications. Your ideal PostgreSQL setup can be re-used for all your future projects. And so on. - - *Sharing.* Docker has access to a [public registry](https://hub.docker.com) + - *Sharing.* Docker has access to a [public registry](https://registry.hub.docker.com/) where thousands of people have uploaded useful containers: anything from Redis, CouchDB, PostgreSQL to IRC bouncers to Rails app servers to Hadoop to base images for various Linux distros. The - [*registry*](../reference/api/registry_index_spec/#registryindexspec) also + [*registry*](/registry/) also includes an official "standard library" of useful containers maintained by the Docker team. The registry itself is open-source, so anyone can deploy their own registry to store and transfer private containers, for internal server