Merge

docsite/latest/Makefile

@@ -11,9 +11,10 @@ viewdocs: clean
 	./build-site.py view
 
 htmldocs:
-	 ./build-site.py rst
+	./build-site.py rst
 
 clean:
+	-rm -rf htmlout
 	-rm -f .buildinfo
 	-rm -f *.inv
 	-rm -rf *.doctrees

docsite/latest/_themes/aworks/layout.html

@@ -0,0 +1,41 @@
+<?php
+require('../wp-blog-header.php');
+get_header();
+?>
+
+<div class="row">
+	<div class="container">
+		<?php if (function_exists('bootstrapwp_breadcrumbs')) bootstrapwp_breadcrumbs(); ?>
+	</div><!--/.container -->
+</div><!--/.row -->
+
+{% macro navBar() %}
+<div id="left-sidebar" class="span3 sidebar">
+    <div class="side-nav sidebar-block left-side-nav">
+      <ul><li><a href="/docs/"><strong>Documentation Home</strong></a></li></ul>
+        {{ toctree(maxdepth=1) }}
+    </div>
+</div>
+{% endmacro %}
+
+{# Silence the sidebar's, relbar's #}
+{% block sidebar1 %}{% endblock %}
+{% block sidebar2 %}{% endblock %}
+{% block relbar1 %}{% endblock %}
+{% block relbar2 %}{% endblock %}
+
+{%- block content %}
+<div class="container">
+<div class="row clear-both">
+    <!-- BEGIN LEFT-SIDEBAR -->
+    {% block header %}{{ navBar() }}{% endblock %}
+    <!-- END LEFT-SIDEBAR -->
+     <!-- BEGIN ARTICLE CONTENT AREA -->
+    <div class="span8 main-column two-columns-left">
+        {% block body %} {% endblock %}
+    </div><!-- END ARTICLE CONTENT AREA -->
+</div> <!-- class=row -->
+</div> <!-- class=container -->
+{%- endblock %}
+
+<?php get_footer('home'); ?>

docsite/latest/_themes/aworks/relations.html

@@ -0,0 +1,8 @@
+{%- if prev %}
+  <li><a href="{{ prev.link|e }}"
+         title="{{ _('previous chapter') }}">{{ "&laquo;"|safe }} {{ prev.title }}</a></li>
+{%- endif %}
+{%- if next %}
+  <li><a href="{{ next.link|e }}"
+         title="{{ _('next chapter') }}">{{ next.title }} {{ "&raquo;"|safe }}</a></li>
+{%- endif %}

docsite/latest/_themes/aworks/searchbox.html

@@ -0,0 +1,7 @@
+{%- if pagename != "search" %}
+<form class="pull-left" action="{{ pathto('search') }}" method="get">
+  <input type="text" name="q" placeholder="Search" />
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+</form>
+{%- endif %}

docsite/latest/_themes/aworks/sourcelink.html

@@ -0,0 +1,4 @@
+{%- if show_source and has_source and sourcename %}
+  <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
+         rel="nofollow">{{ _('Source') }}</a></li>
+{%- endif %}

docsite/latest/_themes/aworks/theme.conf

@@ -0,0 +1,5 @@
+# Twitter Bootstrap Theme
+[theme]
+inherit = basic
+stylesheet = basic.css
+pygments_style = tango

docsite/latest/build-site.py

@@ -45,7 +45,7 @@ class SphinxBuilder(object):
         try:
             buildername = 'html'
 
-            outdir = os.path.abspath(os.getcwd())
+            outdir = os.path.abspath(os.path.join(os.getcwd(), "htmlout"))
             # Create the output directory if it doesn't exist
             if not os.access(outdir, os.F_OK):
                 os.mkdir(outdir)

docsite/latest/conf.py

@@ -101,8 +101,8 @@ pygments_style = 'sphinx'
 # -----------------------
 
 html_theme_path = ['_themes']
-html_theme = 'bootstrap'
+html_theme = 'aworks'
-html_short_title = 'Ansible 1.2 Documentation'
+html_short_title = 'Ansible Documentation'
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
@@ -123,7 +123,7 @@ html_title = 'Ansible 1.2 Documentation'
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = 'favicon.ico'
+#html_favicon = 'favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

docsite/latest/rst/YAMLSyntax.rst

@@ -1,10 +1,6 @@
 YAML Syntax
 ===========
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
 This page provides a basic overview of correct YAML syntax, which is how Ansible
 playbooks (our configuration management language) are expressed.  
 

docsite/latest/rst/api.rst

@@ -1,11 +1,6 @@
 API & Integrations
 ==================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 There are several interesting ways to use Ansible from an API perspective.   You can use
 the Ansible python API to control nodes, you can extend Ansible to respond to various python events,
 and you can plug in inventory data from external data sources.  Ansible is written in its own

docsite/latest/rst/bestpractices.rst

@@ -1,11 +1,6 @@
 Best Practices
 ==============
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest/
-
-
 Here are some tips for making the most of Ansible.
 
 You can find some example playbooks illustrating these best practices in our `ansible-examples repository <https://github.com/ansible/ansible-examples>`_.  (NOTE: These may not use all of the features in the latest release just yet).

docsite/latest/rst/contrib.rst

@@ -1,11 +1,6 @@
 Ansible Resources
 =================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 User contributed playbooks, modules, and articles. This is a small
 curated list, but growing. Everyone is encouraged to add to this
 document, just `edit it on Github <https://github.com/ansible/ansible/blob/devel/docsite/latest/rst/contrib.rst>`_

docsite/latest/rst/examples.rst

@@ -1,10 +1,6 @@
 Command Line Examples And Next Steps
 ====================================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
 .. highlight:: bash
 
 The following examples show how to use `/usr/bin/ansible` for running

docsite/latest/rst/faq.rst

@@ -1,10 +1,6 @@
 Frequently Asked Questions
 ==========================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
 Here are some commonly-asked questions and their answers.
 
 .. contents::

docsite/latest/rst/gettingstarted.rst

@@ -1,11 +1,6 @@
 Getting Started
 ===============
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 .. contents::
    :depth: 2
    :backlinks: top

docsite/latest/rst/glossary.rst

@@ -1,11 +1,6 @@
 Glossary
 ========
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 The following is a list (and re-explanation) of term definitions used elsewhere in the Ansible documentation.
 
 Consult the documentation home page for the full documentation and to see this in context, but this should be a good resource

docsite/latest/rst/index.rst

@@ -3,19 +3,15 @@
 Ansible Documentation Index
 ```````````````````````````
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
 Welcome to the Ansible documentation.  This documentation covers the current released
-version of Ansible (1.2) and may also reference some development version features (and if so,
+version of Ansible (1.2) and may also reference some development version features.
-such sections will be noted).
+
+For the previous released version, see `Ansible 1.1 Docs <http://ansibleworks.com/docs/released/1.1>`_ instead. 
 
 Before we dive into playbooks, configuration management, deployment, and orchestration, we'll learn how to get Ansible installed and some
 basic information.  We'll go over how to execute ad-hoc commands in parallel across your nodes using /usr/bin/ansible.  We'll also see
 what sort of modules are available in Ansible's core (though you can also write your own, which we'll also show later).
 
-
 .. toctree::
    :maxdepth: 1
 
@@ -27,10 +23,10 @@ what sort of modules are available in Ansible's core (though you can also write
 Overview
 ````````
 
-.. image:: http://ansible.cc/img/ansible_arch.png
+.. image:: http://www.ansibleworks.com/wp-content/uploads/2013/06/ANSIBLE_DIAGRAM.jpg
    :alt: ansible architecture diagram
-   :width: 566px
+   :width: 788px
-   :height: 439px
+   :height: 436px
 
 
 Playbooks

docsite/latest/rst/moduledev.rst

@@ -1,11 +1,6 @@
 Module Development
 ==================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 Ansible modules are reusable units of magic that can be used by the Ansible API,
 or by the `ansible` or `ansible-playbook` programs.
 

docsite/latest/rst/modules.rst

@@ -1,10 +1,6 @@
 Ansible Modules
 ===============
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
 .. contents::
    :depth: 3
    :backlinks: top

docsite/latest/rst/patterns.rst

@@ -3,16 +3,11 @@
 Inventory & Patterns
 ====================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 Ansible works against multiple systems in your infrastructure at the
 same time.  It does this by selecting portions of systems listed in
 Ansible's inventory file, which defaults to /etc/ansible/hosts.
 
-.. contents:: `Table of contents`
+.. contents::
    :depth: 2
    :backlinks: top
 

docsite/latest/rst/playbooks.rst

@@ -1,11 +1,6 @@
 Playbooks
 =========
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 .. contents::
    :depth: 2
    :backlinks: top

docsite/latest/rst/playbooks2.rst

@@ -1,11 +1,6 @@
 Advanced Playbooks
 ==================
 
-.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
-   :alt: ansiblefest 2013
-   :target: http://ansibleworks.com/fest
-
-
 Here are some advanced features of the playbooks language.  Using all of these features
 are not neccessary, but many of them will prove useful.  If a feature doesn't seem immediately
 relevant, feel free to skip it.  For many people, the features documented in `playbooks` will