Browse code

Merge pull request #683 from rogaha/doc_meta_info_update

Looks good. Thanks! Closes #637

Thatcher authored on 2013/05/23 11:09:32
Showing 53 changed files
... ...
@@ -1,3 +1,7 @@
1
+:title: Remote API
2
+:description: API Documentation for Docker
3
+:keywords: API, Docker, rcli, REST, documentation
4
+
1 5
 =================
2 6
 Docker Remote API
3 7
 =================
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
1
+:title: API Documentation
2 2
 :description: docker documentation
3
-:keywords:
3
+:keywords: docker, ipa, documentation
4 4
 
5 5
 API's
6 6
 =============
... ...
@@ -1,4 +1,4 @@
1
-:title: docker Registry documentation
1
+:title: Registry Documentation
2 2
 :description: Documentation for docker Registry and Registry API
3 3
 :keywords: docker, registry, api, index
4 4
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Attach Command
2
+:description: Attach to a running container
3
+:keywords: attach, container, docker, documentation
4
+
1 5
 ===========================================
2 6
 ``attach`` -- Attach to a running container
3 7
 ===========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Build Command
2
+:description: Build a new image from the Dockerfile passed via stdin
3
+:keywords: build, docker, container, documentation
4
+
1 5
 ========================================================
2 6
 ``build`` -- Build a container from Dockerfile via stdin
3 7
 ========================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Commit Command
2
+:description: Create a new image from a container's changes
3
+:keywords: commit, docker, container, documentation
4
+
1 5
 ===========================================================
2 6
 ``commit`` -- Create a new image from a container's changes
3 7
 ===========================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Diff Command
2
+:description: Inspect changes on a container's filesystem
3
+:keywords: diff, docker, container, documentation
4
+
1 5
 =======================================================
2 6
 ``diff`` -- Inspect changes on a container's filesystem
3 7
 =======================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Export Command
2
+:description: Export the contents of a filesystem as a tar archive
3
+:keywords: export, docker, container, documentation
4
+
1 5
 =================================================================
2 6
 ``export`` -- Stream the contents of a container as a tar archive
3 7
 =================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: History Command
2
+:description: Show the history of an image
3
+:keywords: history, docker, container, documentation
4
+
1 5
 ===========================================
2 6
 ``history`` -- Show the history of an image
3 7
 ===========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Images Command
2
+:description: List images
3
+:keywords: images, docker, container, documentation
4
+
1 5
 =========================
2 6
 ``images`` -- List images
3 7
 =========================
... ...
@@ -1,3 +1,7 @@
1
+:title: Import Command
2
+:description: Create a new filesystem image from the contents of a tarball
3
+:keywords: import, tarball, docker, url, documentation
4
+
1 5
 ==========================================================================
2 6
 ``import`` -- Create a new filesystem image from the contents of a tarball
3 7
 ==========================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Info Command
2
+:description: Display system-wide information.
3
+:keywords: info, docker, information, documentation
4
+
1 5
 ===========================================
2 6
 ``info`` -- Display system-wide information
3 7
 ===========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Inspect Command
2
+:description: Return low-level information on a container
3
+:keywords: inspect, container, docker, documentation
4
+
1 5
 ==========================================================
2 6
 ``inspect`` -- Return low-level information on a container
3 7
 ==========================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Kill Command
2
+:description: Kill a running container
3
+:keywords: kill, container, docker, documentation
4
+
1 5
 ====================================
2 6
 ``kill`` -- Kill a running container
3 7
 ====================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Login Command
2
+:description: Register or Login to the docker registry server
3
+:keywords: login, docker, documentation
4
+
1 5
 ============================================================
2 6
 ``login`` -- Register or Login to the docker registry server
3 7
 ============================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Logs Command
2
+:description: Fetch the logs of a container
3
+:keywords: logs, container, docker, documentation
4
+
1 5
 =========================================
2 6
 ``logs`` -- Fetch the logs of a container
3 7
 =========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Port Command
2
+:description: Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
3
+:keywords: port, docker, container, documentation
4
+
1 5
 =========================================================================
2 6
 ``port`` -- Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
3 7
 =========================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Ps Command
2
+:description: List containers
3
+:keywords: ps, docker, documentation, container
4
+
1 5
 =========================
2 6
 ``ps`` -- List containers
3 7
 =========================
... ...
@@ -1,3 +1,7 @@
1
+:title: Pull Command
2
+:description: Pull an image or a repository from the registry
3
+:keywords: pull, image, repo, repository, documentation, docker
4
+
1 5
 =========================================================================
2 6
 ``pull`` -- Pull an image or a repository from the docker registry server
3 7
 =========================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Push Command
2
+:description: Push an image or a repository to the registry
3
+:keywords: push, docker, image, repository, documentation, repo
4
+
1 5
 =======================================================================
2 6
 ``push`` -- Push an image or a repository to the docker registry server
3 7
 =======================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Restart Command
2
+:description: Restart a running container
3
+:keywords: restart, container, docker, documentation
4
+
1 5
 ==========================================
2 6
 ``restart`` -- Restart a running container
3 7
 ==========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Rm Command
2
+:description: Remove a container
3
+:keywords: remove, container, docker, documentation, rm
4
+
1 5
 ============================
2 6
 ``rm`` -- Remove a container
3 7
 ============================
... ...
@@ -1,3 +1,7 @@
1
+:title: Rmi Command
2
+:description: Remove an image
3
+:keywords: rmi, remove, image, docker, documentation
4
+
1 5
 ==========================
2 6
 ``rmi`` -- Remove an image
3 7
 ==========================
... ...
@@ -1,3 +1,7 @@
1
+:title: Run Command
2
+:description: Run a command in a new container
3
+:keywords: run, container, docker, documentation 
4
+
1 5
 ===========================================
2 6
 ``run`` -- Run a command in a new container
3 7
 ===========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Search Command
2
+:description: Searches for the TERM parameter on the Docker index and prints out a list of repositories that match.
3
+:keywords: search, docker, image, documentation 
4
+
1 5
 ===================================================================
2 6
 ``search`` -- Search for an image in the docker index
3 7
 ===================================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Start Command
2
+:description: Start a stopped container
3
+:keywords: start, docker, container, documentation
4
+
1 5
 ======================================
2 6
 ``start`` -- Start a stopped container
3 7
 ======================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Stop Command
2
+:description: Stop a running container
3
+:keywords: stop, container, docker, documentation
4
+
1 5
 ====================================
2 6
 ``stop`` -- Stop a running container
3 7
 ====================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Tag Command
2
+:description: Tag an image into a repository
3
+:keywords: tag, docker, image, repository, documentation, repo
4
+
1 5
 =========================================
2 6
 ``tag`` -- Tag an image into a repository
3 7
 =========================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Version Command
2
+:description: 
3
+:keywords: version, docker, documentation
4
+
1 5
 ==================================================
2 6
 ``version`` -- Show the docker version information
3 7
 ==================================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Wait Command
2
+:description: Block until a container stops, then print its exit code.
3
+:keywords: wait, docker, container, documentation
4
+
1 5
 ===================================================================
2 6
 ``wait`` -- Block until a container stops, then print its exit code
3 7
 ===================================================================
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
1
+:title: Commands
2 2
 :description: -- todo: change me
3
-:keywords: todo: change me
3
+:keywords: todo, commands, command line, help, docker, documentation
4 4
 
5 5
 
6 6
 Commands
... ...
@@ -1,4 +1,4 @@
1
-:title: Building blocks
1
+:title: Building Blocks
2 2
 :description: An introduction to docker and standard containers?
3 3
 :keywords: containers, lxc, concepts, explanation
4 4
 
... ...
@@ -1,6 +1,6 @@
1 1
 :title: Introduction
2 2
 :description: An introduction to docker and standard containers?
3
-:keywords: containers, lxc, concepts, explanation
3
+:keywords: containers, lxc, concepts, explanation, docker, documentation
4 4
 
5 5
 
6 6
 :note: This version of the introduction is temporary, just to make sure we don't break the links from the website when the documentation is updated
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
1
+:title: Concepts
2 2
 :description: -- todo: change me
3
-:keywords: todo: change me
3
+:keywords: concepts, documentation, docker, containers
4 4
 
5 5
 
6 6
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Contribution Guidelines
2
+:description: Contribution guidelines: create issues, convetions, pull requests
3
+:keywords: contributing, docker, documentation, help, guideline
4
+
1 5
 Contributing to Docker
2 6
 ======================
3 7
 
... ...
@@ -1,3 +1,7 @@
1
+:title: FAQ
2
+:description: Most frequently asked questions.
3
+:keywords: faq, questions, documentation, docker
4
+
1 5
 FAQ
2 6
 ===
3 7
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Index Environment Variable
2
+:description: Setting this environment variable on the docker server will change the URL docker index.
3
+:keywords: docker, index environment variable, documentation 
4
+
1 5
 =================================
2 6
 Docker Index Environment Variable
3 7
 =================================
... ...
@@ -1,3 +1,7 @@
1
+:title: Installation on Amazon EC2 
2
+:description: Docker installation on Amazon EC2 with a single vagrant command. Vagrant 1.1 or higher is required.
3
+:keywords: amazon ec2, virtualization, cloud, docker, documentation, installation
4
+
1 5
 Amazon EC2
2 6
 ==========
3 7
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Installation on Arch Linux
2
+:description: Docker installation on Arch Linux. 
3
+:keywords: arch linux, virtualization, docker, documentation, installation
4
+
1 5
 .. _arch_linux:
2 6
 
3 7
 Arch Linux
... ...
@@ -1,3 +1,7 @@
1
+:title: Installation from Binaries
2
+:description: This instruction set is meant for hackers who want to try out Docker on a variety of environments.
3
+:keywords: binaries, installation, docker, documentation, linux
4
+
1 5
 .. _binaries:
2 6
 
3 7
 Binaries
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
1
+:title: Documentation
2 2
 :description: -- todo: change me
3
-:keywords: todo: change me
3
+:keywords: todo, docker, documentation, installation, OS support
4 4
 
5 5
 
6 6
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Kernel Requirements
2
+:description: Kernel supports
3
+:keywords: kernel requirements, kernel support, docker, installation, cgroups, namespaces
4
+
1 5
 .. _kernel:
2 6
 
3 7
 Kernel Requirements
... ...
@@ -1,3 +1,7 @@
1
+:title: Rackspace Cloud Installation
2
+:description: Installing Docker on Ubuntu proviced by Rackspace
3
+:keywords: Rackspace Cloud, installation, docker, linux, ubuntu
4
+
1 5
 ===============
2 6
 Rackspace Cloud
3 7
 ===============
... ...
@@ -1,3 +1,7 @@
1
+:title: Requirements and Installation on Ubuntu Linux
2
+:description: Please note this project is currently under heavy development. It should not be used in production.
3
+:keywords: Docker, Docker documentation, requirements, virtualbox, vagrant, git, ssh, putty, cygwin, linux
4
+
1 5
 .. _ubuntu_linux:
2 6
 
3 7
 Ubuntu Linux
... ...
@@ -1,3 +1,7 @@
1
+:title: Upgrading
2
+:description: These instructions are for upgrading Docker
3
+:keywords: Docker, Docker documentation, upgrading docker, upgrade
4
+
1 5
 .. _upgrading:
2 6
 
3 7
 Upgrading
... ...
@@ -1,3 +1,6 @@
1
+:title: Using Vagrant (Mac, Linux)
2
+:description: This guide will setup a new virtualbox virtual machine with docker installed on your computer.
3
+:keywords: Docker, Docker documentation, virtualbox, vagrant, git, ssh, putty, cygwin
1 4
 
2 5
 .. _install_using_vagrant:
3 6
 
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
2
-:description: docker documentation
3
-:keywords:
1
+:title: Documentation
2
+:description: -- todo: change me
3
+:keywords: todo, docker, documentation, installation, usage, examples, contributing, faq, command line, concepts
4 4
 
5 5
 Documentation
6 6
 =============
... ...
@@ -1,6 +1,6 @@
1
-:title: Base commands
1
+:title: Basic Commands
2 2
 :description: Common usage and commands
3
-:keywords: Examples, Usage
3
+:keywords: Examples, Usage, basic commands, docker, documentation, examples
4 4
 
5 5
 
6 6
 The basics
... ...
@@ -1,3 +1,7 @@
1
+:title: Docker Builder
2
+:description: Docker Builder specifes a simple DSL which allows you to automate the steps you would normally manually take to create an image.
3
+:keywords: builder, docker, Docker Builder, automation, image creation
4
+
1 5
 ==============
2 6
 Docker Builder
3 7
 ==============
... ...
@@ -1,6 +1,6 @@
1
-:title: docker documentation
1
+:title: Documentation
2 2
 :description: -- todo: change me
3
-:keywords: todo: change me
3
+:keywords: todo, docker, documentation, basic, builder
4 4
 
5 5
 
6 6
 
... ...
@@ -1,3 +1,6 @@
1
+:title: Puppet Usage
2
+:description: Installating and using Puppet
3
+:keywords: puppet, installation, usage, docker, documentation
1 4
 
2 5
 .. _install_using_puppet:
3 6
 
... ...
@@ -1,3 +1,7 @@
1
+:title: Working With Repositories
2
+:description: Generally, there are two types of repositories: Top-level repositories which are controlled by the people behind Docker, and user repositories.
3
+:keywords: repo, repositiores, usage, pull image, push image, image, documentation
4
+
1 5
 .. _working_with_the_repository:
2 6
 
3 7
 Working with the repository
... ...
@@ -8,7 +8,7 @@
8 8
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
9 9
     <meta name="google-site-verification" content="UxV66EKuPe87dgnH1sbrldrx6VsoWMrx5NjwkgUFxXI" />
10 10
 
11
-    <title>Docker - {{ meta['title'] if meta and meta['title'] else title }}</title>
11
+    <title>{{ meta['title'] if meta and meta['title'] else title }} - Docker Documentation</title>
12 12
 
13 13
     <meta name="description" content="{{ meta['description'] if meta }}" />
14 14
     <meta name="keywords" content="{{ meta['keywords'] if meta }}" />