Merge branch 'master' of ssh://github.com/dotcloud/docker

Upstream-commit: 84d1929973a53717151bfb02d006f3c2d430e3c3
Component: engine

components/engine/container.go

@@ -258,8 +258,9 @@ func (container *Container) Start() error {
 
 	var err error
 	if container.Config.Tty {
-		container.cmd.Env = append(container.Config.Env,
-			"TERM=xterm",
+		container.cmd.Env = append(
+			[]string{"TERM=xterm"},
+			container.cmd.Env...,
 		)
 		err = container.startPty()
 	} else {

components/engine/docs/sources/documentation/commandline/basecommands.rst

@@ -1,4 +1,4 @@
-:title: docker documentation
+:title: Base commands
 :description: Common usage and commands
 :keywords: Examples, Usage
 

components/engine/docs/sources/documentation/contributing/devenvironment.rst

@@ -1,4 +1,4 @@
-:title: Contributing to Docker
+:title: Setting up a dev environment
 :description: Guides on how to contribute to docker
 :keywords: Docker, documentation, developers, contributing, dev environment
 

components/engine/docs/sources/documentation/examples/hello_world.rst

@@ -1,4 +1,4 @@
-:title: Docker: Hello world example
+:title: Hello world example
 :description: A simple hello world example with Docker
 :keywords: docker, example, hello world
 

components/engine/docs/sources/documentation/examples/hello_world_daemon.rst

@@ -1,4 +1,4 @@
-:title: Docker: Hello world daemon example
+:title: Hello world daemon example
 :description: A simple hello world daemon example with Docker
 :keywords: docker, example, hello world, daemon
 

components/engine/docs/sources/documentation/examples/python_web_app.rst

@@ -1,4 +1,4 @@
-:title: Docker: Python Web app example
+:title: Python Web app example
 :description: Building your own python web app using docker
 :keywords: docker, example, python, web app
 

components/engine/docs/theme/docker/layout.html

@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
-    <title>dotCloud - {{ meta['title'] if meta and meta['title'] else title }}</title>
+    <title>Docker - {{ meta['title'] if meta and meta['title'] else title }}</title>
 
     <meta name="description" content="{{ meta['description'] if meta }}" />
     <meta name="keywords" content="{{ meta['keywords'] if meta }}" />