From 9fe27fc82518da45c4886678eb5aaedb62a2d26c Mon Sep 17 00:00:00 2001
From: Andy Rothfusz <github@metaliveblog.com>
Date: Thu, 7 Nov 2013 12:20:23 -0800
Subject: [PATCH] Fix 2585 and clean up warning in contributing.rst
 Upstream-commit: 97c3de7e6b92b13efa30c5c840ce2fab07b8794e Component: engine

---
 .../engine/docs/sources/api/remote_api_client_libraries.rst   | 2 ++
 components/engine/docs/sources/contributing/contributing.rst  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/engine/docs/sources/api/remote_api_client_libraries.rst b/components/engine/docs/sources/api/remote_api_client_libraries.rst
index bd8610eaf1..8243d02c80 100644
--- a/components/engine/docs/sources/api/remote_api_client_libraries.rst
+++ b/components/engine/docs/sources/api/remote_api_client_libraries.rst
@@ -35,3 +35,5 @@ and we will add the libraries here.
 +----------------------+----------------+--------------------------------------------+
 | Go                   | go-dockerclient| https://github.com/fsouza/go-dockerclient  |
 +----------------------+----------------+--------------------------------------------+
+| PHP                  | Alvine         | http://pear.alvine.io/ (alpha)             |
++----------------------+----------------+--------------------------------------------+
diff --git a/components/engine/docs/sources/contributing/contributing.rst b/components/engine/docs/sources/contributing/contributing.rst
index 3cdb0b6f14..f4a6b472ff 100644
--- a/components/engine/docs/sources/contributing/contributing.rst
+++ b/components/engine/docs/sources/contributing/contributing.rst
@@ -10,13 +10,13 @@ Want to hack on Docker? Awesome!
 The repository includes `all the instructions you need to get
 started <https://github.com/dotcloud/docker/blob/master/CONTRIBUTING.md>`_.
 
-The developer environment `Dockerfile <https://github.com/dotcloud/docker/blob/master/Dockerfile>`_
+The `developer environment Dockerfile <https://github.com/dotcloud/docker/blob/master/Dockerfile>`_
 specifies the tools and versions used to test and build Docker.
 
 If you're making changes to the documentation, see the
 `README.md <https://github.com/dotcloud/docker/blob/master/docs/README.md>`_.
 
-The documentation environment `Dockerfile <https://github.com/dotcloud/docker/blob/master/docs/Dockerfile>`_
+The `documentation environment Dockerfile <https://github.com/dotcloud/docker/blob/master/docs/Dockerfile>`_
 specifies the tools and versions used to build the Documentation.
 
 Further interesting details can be found in the `Packaging hints <https://github.com/dotcloud/docker/blob/master/hack/PACKAGERS.md>`_.