Merge branch 'master' into muzzle

docs/_static/homepage.css

@@ -62,6 +62,7 @@
   padding: 40px 0 30px;
   margin-bottom: 0;
   color: #fff;
+  margin-top: -19px;
 }
 
 .masthead h1 {

docs/_templates/index.html

@@ -8,8 +8,8 @@
     <h1>Guzzle</h1>
     <p>Guzzle is a PHP HTTP client<br />&amp; framework for building RESTful web service clients.</p>
     <p>
-      <a class="btn btn-primary btn-large" href="https://github.com/guzzle/guzzle">View Guzzle on GitHub</a>
+      <a class="btn btn-primary btn-lg" href="https://github.com/guzzle/guzzle">View Guzzle on GitHub</a>
-      <a class="btn btn-large" href="{{ pathto('docs') }}">Read the docs</a>
+      <a class="btn btn-default btn-lg" href="{{ pathto('docs') }}">Read the docs</a>
     </p>
     </div>
 </div>

docs/_templates/leftbar.html

@@ -1,10 +0,0 @@
-<div class="hidden-phone">
-  <h3>Need help?</h3>
-  <p>Please post to our google group or #guzzlephp IRC channel on freenode if you need support or have a technical
-  question.</p>
-</div>
-<div class="hidden-phone">
-  <h3>Found an error?</h3>
-  <p>If you find an error in the documentation, please file a ticket or submit a pull request on
-  <a href="https://github.com/guzzle/guzzle">GitHub</a></p>
-</div>

docs/_templates/nav_links.html

@@ -2,5 +2,4 @@
 <li><a href="http://guzzlephp.org/api/index.html">API</a></li>
 <li><a href="https://github.com/guzzle/guzzle">GitHub</a></li>
 <li><a href="https://groups.google.com/forum/?hl=en#!forum/guzzle">Forum</a></li>
-<li><a href="https://packagist.org/packages/guzzle/guzzle">Packagist</a></li>
 <li><a href="irc:irc.freenode.com/#guzzlephp">IRC</a></li>

docs/conf.py

@@ -42,6 +42,8 @@ htmlhelp_basename = 'Guzzledoc'
 
 # -- Guzzle Sphinx theme setup ------------------------------------------------
 
+sys.path.insert(0, '/Users/dowling/projects/guzzle_sphinx_theme')
+
 import guzzle_sphinx_theme
 pygments_style = 'guzzle_sphinx_theme.GuzzleStyle'
 html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'

docs/docs.rst

@@ -1,43 +1,5 @@
 .. title:: Guzzle | PHP HTTP client and framework for consuming RESTful web services
 
-.. toctree::
-    :hidden:
-
-    getting-started/overview
-    getting-started/installation
-
-    http-client/client
-    http-client/request
-    http-client/response
-    http-client/entity-bodies
-    http-client/http-redirects
-
-    plugins/plugins-overview
-    plugins/creating-plugins
-    plugins/async-plugin
-    plugins/backoff-plugin
-    plugins/cache-plugin
-    plugins/cookie-plugin
-    plugins/curl-auth-plugin
-    plugins/history-plugin
-    plugins/log-plugin
-    plugins/md5-validator-plugin
-    plugins/mock-plugin
-    plugins/oauth-plugin
-
-    webservice-client/webservice-client
-    webservice-client/using-the-service-builder
-    webservice-client/guzzle-service-descriptions
-
-    batching/batching
-
-    iterators/resource-iterators
-    iterators/guzzle-iterators
-
-    testing/unit-testing.rst
-    http-client/uri-templates
-    getting-started/faq
-
 ====================
 Guzzle Documentation
 ====================
@@ -45,58 +7,67 @@ Guzzle Documentation
 Getting started
 ---------------
 
-.. list-table::
+.. toctree::
-   :header-rows: 0
+   :maxdepth: 1
-   :stub-columns: 0
-   :class: two-column
 
-   * - :doc:`getting-started/overview`
+   getting-started/overview
-     - :doc:`getting-started/installation`
+   getting-started/installation
-   * - :doc:`getting-started/faq`
+   getting-started/faq
-     - `Read the API docs <http://guzzlephp.org/api/index.html>`_
 
 The HTTP client
 ---------------
 
-.. list-table::
+.. toctree::
-   :header-rows: 0
+   :maxdepth: 2
-   :stub-columns: 0
-   :class: two-column
 
-   * - :doc:`http-client/client`
+   http-client/client
-     - :doc:`http-client/request`
+   http-client/request
-   * - :doc:`http-client/response`
+   http-client/response
-     - :doc:`http-client/entity-bodies`
+   http-client/entity-bodies
-   * - :doc:`http-client/http-redirects`
+   http-client/http-redirects
-     - :doc:`http-client/uri-templates`
+   http-client/uri-templates
 
 Plugins
 -------
 
-.. list-table::
+.. toctree::
-   :header-rows: 0
+   :maxdepth: 1
-   :stub-columns: 0
-   :class: two-column
 
-   * - :doc:`plugins/plugins-overview`
+   plugins/plugins-overview
-     - :doc:`plugins/creating-plugins`
+   plugins/creating-plugins
+   plugins/async-plugin
+   plugins/backoff-plugin
+   plugins/cache-plugin
+   plugins/cookie-plugin
+   plugins/curl-auth-plugin
+   plugins/history-plugin
+   plugins/log-plugin
+   plugins/md5-validator-plugin
+   plugins/mock-plugin
+   plugins/oauth-plugin
 
 The web service client
 ----------------------
 
-.. list-table::
+.. toctree::
-   :header-rows: 0
+   :maxdepth: 1
-   :stub-columns: 0
-   :class: two-column
 
-   * - :doc:`webservice-client/webservice-client`
+   webservice-client/webservice-client
-     - :doc:`webservice-client/using-the-service-builder`
+   webservice-client/using-the-service-builder
-   * - :doc:`webservice-client/guzzle-service-descriptions`
+   webservice-client/guzzle-service-descriptions
-     - :doc:`batching/batching`
+   batching/batching
-   * - :doc:`iterators/resource-iterators`
+   iterators/resource-iterators
-     - :doc:`iterators/guzzle-iterators`
+   iterators/guzzle-iterators
 
 Testing
 -------
 
-* :doc:`testing/unit-testing`
+.. toctree::
+   :maxdepth: 2
+
+   testing/unit-testing
+
+API Docs
+--------
+
+`Read the API docs <http://guzzlephp.org/api/index.html>`_

docs/requirements.txt

@@ -1,2 +1,2 @@
 Sphinx>=1.2b1
-guzzle_sphinx_theme>=0.4.0
+guzzle_sphinx_theme>=0.5.0