浏览代码

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 <[email protected]>
Ben Firshman 10 年之前
父节点
当前提交
91ceb33d5a
共有 3 个文件被更改,包括 10 次插入11 次删除
  1. 4 5
      README.md
  2. 1 1
      compose/cli/main.py
  3. 5 5
      docs/index.md

+ 4 - 5
README.md

@@ -2,10 +2,10 @@ Docker Compose
 ==============
 ==============
 *(Previously known as Fig)*
 *(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
 Compose is great for development environments, staging servers, and CI. We don't
 recommend that you use it in production yet.
 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/)
 [![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).
 Want to help build Compose? Check out our [contributing documentation](https://github.com/docker/compose/blob/master/CONTRIBUTING.md).
-

+ 1 - 1
compose/cli/main.py

@@ -72,7 +72,7 @@ def parse_doc_section(name, source):
 
 
 
 
 class TopLevelCommand(Command):
 class TopLevelCommand(Command):
-    """Fast, isolated development environments using Docker.
+    """Define and run multi-container applications with Docker.
 
 
     Usage:
     Usage:
       docker-compose [options] [COMMAND] [ARGS...]
       docker-compose [options] [COMMAND] [ARGS...]

+ 5 - 5
docs/index.md

@@ -7,10 +7,10 @@ page_keywords: documentation, docs,  docker, compose, orchestration, containers
 
 
 ## Overview
 ## 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
 Compose is great for development environments, staging servers, and CI. We don't
 recommend that you use it in production yet.
 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).
   [Rails](rails.md), or [Wordpress](wordpress.md).
 - See the reference guides for complete details on the [commands](cli.md), the
 - See the reference guides for complete details on the [commands](cli.md), the
   [configuration file](yml.md) and [environment variables](env.md).
   [configuration file](yml.md) and [environment variables](env.md).
-  
+
 ## Release Notes
 ## Release Notes
 
 
 ### Version 1.2.0 (April 7, 2015)
 ### Version 1.2.0 (April 7, 2015)