From 91ceb33d5a70ba54fcc87dd934d35daba77aa40c Mon Sep 17 00:00:00 2001 From: Ben Firshman Date: Tue, 26 May 2015 15:41:59 +0100 Subject: [PATCH] Update description of Compose "Define and run multi-container applications with Docker" Not just development environments, and "complex" is not clear and not really true. Signed-off-by: Ben Firshman --- README.md | 9 ++++----- compose/cli/main.py | 2 +- docs/index.md | 10 +++++----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 522488e7a..acd3cbe7a 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Docker Compose ============== *(Previously known as Fig)* -Compose is a tool for defining and running complex applications with Docker. -With Compose, you define a multi-container application in a single file, then -spin your application up in a single command which does everything that needs to -be done to get it running. +Compose is a tool for defining and running multi-container applications with +Docker. With Compose, you define a multi-container application in a single +file, then spin your application up in a single command which does everything +that needs to be done to get it running. Compose is great for development environments, staging servers, and CI. We don't recommend that you use it in production yet. @@ -50,4 +50,3 @@ Contributing [![Build Status](http://jenkins.dockerproject.com/buildStatus/icon?job=Compose Master)](http://jenkins.dockerproject.com/job/Compose%20Master/) Want to help build Compose? Check out our [contributing documentation](https://github.com/docker/compose/blob/master/CONTRIBUTING.md). - diff --git a/compose/cli/main.py b/compose/cli/main.py index a2dca65db..00fe3115c 100644 --- a/compose/cli/main.py +++ b/compose/cli/main.py @@ -72,7 +72,7 @@ def parse_doc_section(name, source): class TopLevelCommand(Command): - """Fast, isolated development environments using Docker. + """Define and run multi-container applications with Docker. Usage: docker-compose [options] [COMMAND] [ARGS...] diff --git a/docs/index.md b/docs/index.md index 44f56ae96..981a02702 100644 --- a/docs/index.md +++ b/docs/index.md @@ -7,10 +7,10 @@ page_keywords: documentation, docs, docker, compose, orchestration, containers ## Overview -Compose is a tool for defining and running complex applications with Docker. -With Compose, you define a multi-container application in a single file, then -spin your application up in a single command which does everything that needs to -be done to get it running. +Compose is a tool for defining and running multi-container applications with +Docker. With Compose, you define a multi-container application in a single +file, then spin your application up in a single command which does everything +that needs to be done to get it running. Compose is great for development environments, staging servers, and CI. We don't recommend that you use it in production yet. @@ -200,7 +200,7 @@ At this point, you have seen the basics of how Compose works. [Rails](rails.md), or [Wordpress](wordpress.md). - See the reference guides for complete details on the [commands](cli.md), the [configuration file](yml.md) and [environment variables](env.md). - + ## Release Notes ### Version 1.2.0 (April 7, 2015)