Merge branch 'pause-unpause' of github.com:phensley/docker-py into phensley-pause-unpause

Conflicts:
	README.md
	tests/integration_test.py
	tests/test.py

1 files changed, 17 insertions, 0 deletions

diff --git a/docs/api.md b/docs/api.md
index 613e260..73fec4d 100644
--- a/docs/api.md
+++ b/docs/api.md
@@ -400,6 +400,15 @@ output as it happens.
 
 **Returns** (generator or str):
 
+## pause
+
+Pauses all processes within a container.
+
+**Params**:
+
+* container (str): The container to pause
+
+
 ## ping
 
 Hits the `/_ping` endpoint of the remote API and returns the result. An 
@@ -673,6 +682,14 @@ Display the running processes of a container
  'Titles': ['PID', 'USER', 'COMMAND']}
 ```
 
+## unpause
+
+Unpauses all processes within a container.
+
+**Params**:
+
+* container (str): The container to unpause
+
 ## version
 Nearly identical to the `docker version` command.