summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2014-11-03 23:02:14 +0100
committerJoffrey F <joffrey@docker.com>2014-11-03 23:02:14 +0100
commit079bf7ecfb2598f734cc97da37867489683eb689 (patch)
treee4c6b730b10823f92a1e633e6f604c5faecdbb48
parent0ff92f5f123bfa617595cf19ace0c013001021cb (diff)
downloaddocker-py-079bf7ecfb2598f734cc97da37867489683eb689.tar.gz
exec -> execute
-rw-r--r--docs/api.md4
-rw-r--r--docs/change_log.md2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/api.md b/docs/api.md
index 73fec4d..19e7829 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -221,10 +221,10 @@ Inspect changes on a container's filesystem
**Returns** (str):
-## exec
+## execute
```python
-c.exec(container, cmd, detach=False, stdout=True, stderr=True,
+c.execute(container, cmd, detach=False, stdout=True, stderr=True,
stream=False, tty=False)
```
diff --git a/docs/change_log.md b/docs/change_log.md
index 66b0ff1..231e98c 100644
--- a/docs/change_log.md
+++ b/docs/change_log.md
@@ -13,7 +13,7 @@ Change Log
## Features
-* Added the `exec` command.
+* Added the `execute` command.
* Added `pause` and `unpause` commands.
* Added support fo the `cpuset` param in `create_container`
* Added support for host devices (`devices` param in `start`)