diff --git a/docsite/_themes/bootstrap/layout.html b/docsite/_themes/bootstrap/layout.html
index 30f8add71cd..43431de0621 100644
--- a/docsite/_themes/bootstrap/layout.html
+++ b/docsite/_themes/bootstrap/layout.html
@@ -134,6 +134,8 @@ $(window).ready(set_max_menu_height);
{%- block footer %}
{%- endblock %}
diff --git a/docsite/conf.py b/docsite/conf.py
index 47b17a362f1..f3c9adecb18 100644
--- a/docsite/conf.py
+++ b/docsite/conf.py
@@ -25,7 +25,7 @@ sys.path.insert(0, os.path.join('ansible', 'lib'))
sys.path.append(os.path.abspath('_themes'))
VERSION='0.01'
-AUTHOR='Michael DeHaan'
+AUTHOR='AnsibleWorks'
# General configuration
@@ -51,7 +51,7 @@ master_doc = 'index'
# General substitutions.
project = 'Ansible Documentation'
-copyright = "2012 Michael DeHaan"
+copyright = "2013 AnsibleWorks"
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
diff --git a/docsite/rst/YAMLSyntax.rst b/docsite/rst/YAMLSyntax.rst
index b8fb861cbbc..226ca947697 100644
--- a/docsite/rst/YAMLSyntax.rst
+++ b/docsite/rst/YAMLSyntax.rst
@@ -1,6 +1,11 @@
YAML Syntax
===========
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
This page provides a basic overview of correct YAML syntax, which is how Ansible
playbooks (our configuration management language) are expressed.
diff --git a/docsite/rst/api.rst b/docsite/rst/api.rst
index 272a0481e85..2762be78321 100644
--- a/docsite/rst/api.rst
+++ b/docsite/rst/api.rst
@@ -1,6 +1,11 @@
API & Integrations
==================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
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
diff --git a/docsite/rst/bestpractices.rst b/docsite/rst/bestpractices.rst
index d398a627b8d..67bfddc7336 100644
--- a/docsite/rst/bestpractices.rst
+++ b/docsite/rst/bestpractices.rst
@@ -1,6 +1,11 @@
Best Practices
==============
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
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 `_.
diff --git a/docsite/rst/contrib.rst b/docsite/rst/contrib.rst
index b2f23957b26..3e2a2684cef 100644
--- a/docsite/rst/contrib.rst
+++ b/docsite/rst/contrib.rst
@@ -1,6 +1,11 @@
Ansible Resources
=================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
User contributed playbooks, modules, and articles. This is a small
curated list, but growing. Everyone is encouraged to add to this
document, just send in a github pull request to docsite/rst/contrib.rst!
diff --git a/docsite/rst/examples.rst b/docsite/rst/examples.rst
index 6c25b56bc92..30497fcf2d6 100644
--- a/docsite/rst/examples.rst
+++ b/docsite/rst/examples.rst
@@ -1,6 +1,10 @@
Command Line Examples And Next Steps
====================================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
.. highlight:: bash
The following examples show how to use `/usr/bin/ansible` for running
diff --git a/docsite/rst/gettingstarted.rst b/docsite/rst/gettingstarted.rst
index 450ebe7419b..ab597d58601 100644
--- a/docsite/rst/gettingstarted.rst
+++ b/docsite/rst/gettingstarted.rst
@@ -1,6 +1,11 @@
Getting Started
===============
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
.. contents::
:depth: 2
:backlinks: top
diff --git a/docsite/rst/glossary.rst b/docsite/rst/glossary.rst
index 6faeb229cb8..53156e41763 100644
--- a/docsite/rst/glossary.rst
+++ b/docsite/rst/glossary.rst
@@ -1,6 +1,11 @@
Glossary
========
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
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
diff --git a/docsite/rst/index.rst b/docsite/rst/index.rst
index b11b2cd9ed3..7bdbc09af3d 100644
--- a/docsite/rst/index.rst
+++ b/docsite/rst/index.rst
@@ -3,12 +3,22 @@
Ansible Documentation
`````````````````````
-This page contains documentation about how to use `Ansible `_.
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
-Before we dive into playbooks, configuration management, deployment, and orchestration, learn how to get Ansible installed and some
+
+This page contains documentation about how to use `Ansible `_. You may also be interested in taking a class:
+
+.. image:: http://www.ansibleworks.com.s3-website-us-east-1.amazonaws.com/img/banners/training.png
+ :alt: ansibleworks training
+ :target: http://www.ansibleworks.com/training/
+
+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
@@ -17,7 +27,6 @@ what sort of modules are available in Ansible's core (though you can also write
examples
modules
-
Overview
````````
@@ -26,6 +35,7 @@ Overview
:width: 566px
:height: 439px
+
Playbooks
`````````
diff --git a/docsite/rst/moduledev.rst b/docsite/rst/moduledev.rst
index 0f71beccbf1..c76b494a5f0 100644
--- a/docsite/rst/moduledev.rst
+++ b/docsite/rst/moduledev.rst
@@ -1,6 +1,11 @@
Module Development
==================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
Ansible modules are reusable units of magic that can be used by the Ansible API,
or by the `ansible` or `ansible-playbook` programs.
diff --git a/docsite/rst/modules.rst b/docsite/rst/modules.rst
index 841dd80f15f..1bac99e69cf 100644
--- a/docsite/rst/modules.rst
+++ b/docsite/rst/modules.rst
@@ -1,6 +1,10 @@
Ansible Modules
===============
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
.. contents::
:depth: 2
:backlinks: top
diff --git a/docsite/rst/patterns.rst b/docsite/rst/patterns.rst
index 475484e9ffe..12348f28982 100644
--- a/docsite/rst/patterns.rst
+++ b/docsite/rst/patterns.rst
@@ -3,6 +3,11 @@
Inventory & Patterns
====================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
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.
diff --git a/docsite/rst/playbooks.rst b/docsite/rst/playbooks.rst
index 3c5c4dad64e..93c5c68bf87 100644
--- a/docsite/rst/playbooks.rst
+++ b/docsite/rst/playbooks.rst
@@ -1,6 +1,11 @@
Playbooks
=========
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
.. contents::
:depth: 2
:backlinks: top
diff --git a/docsite/rst/playbooks2.rst b/docsite/rst/playbooks2.rst
index a47fdc58e9f..d50a3e77fec 100644
--- a/docsite/rst/playbooks2.rst
+++ b/docsite/rst/playbooks2.rst
@@ -1,6 +1,11 @@
Advanced Playbooks
==================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://www.eventbrite.com/event/5593981750
+
+
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
diff --git a/docsite/rst/who_uses_ansible.rst b/docsite/rst/who_uses_ansible.rst
deleted file mode 100644
index 157b0f8ab8c..00000000000
--- a/docsite/rst/who_uses_ansible.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-.. _who_uses_ansible:
-
-Who Uses Ansible
-================
-
-The following is an opt-in list of just some of the folks using Ansible -- to get your company details here, `Email Michael `_.
-
- * `Action.IO `_ - Action.IO Cloud Development Platform
- * `Alta Language Services `_ - language testing, solutions, and translation services
- * `Aspiro TV `_ - Media Streaming
- * `Basho `_ - makers of NoSQL engine Riak
- * `CatN Hosting `_ - scalable Cloud hosting
- * `Cygate AB `_ - IT solutions from Malmo, Sweeden
- * `D square NV `_ - Process industry data mining, Belgium
- * `Dag IT Solutions `_ - Enterprise Linux & Beyond
- * `Digital Repository of Ireland ` - Digital Preservation and Archiving
- * `Duke University Economics `_ - Research & Education
- * `Eucalyptus Systems Inc. `_ - Makers of the AWS-compatible private cloud platform
- * `Ginsys `_ - Linux infrastructure consulting from Belgium
- * `The Fedora Project `_ - Produces the Popular Linux Distribution
- * `Four Kitchens `_ - The Drupal Experts
- * `Muck Rack `_ - "The destination for journalists on twitter & social media"
- * `HP (Germany) `_ - HP
- * `Nimbis Services `_ - Technical Computing for the Cloud
- * `Lizenfrei.at `_ - Open Source consulting and development, Austria
- * `Schmooze Com `_ - Creators of Industry Leading PBX Platforms
- * `Scientific Computing Center, Aristotle Univ. of Thessaloniki `_ - Grid/Cloud-Based Scientific Computing
- * `Shorty Awards `_ - Honoring the best in social media
- * `Speedy Rails `_ - Cloud Based Rails Hosting
- * `Skylines.io `_ - Real time photo search engine
- * `Steelhouse `_ - Behavioral commerce
- * `Tent.is `_ - "The easiest way to start using Tent"
- * `Tranquil Hosting `_ - Managed Linux Hosting Services
- * `Trinity Centre for High Performance Computing - `_ - Research and Education
- * `Tomorrow Focus Technologies GmbH `_ - Running some of the biggest web sites in Europe
- * `123i.com.br `_ - Find real estate in Brazil
-