Since master branch are named release-XX now, just link to examples on the devel branch.

YAMLSyntax.html

@@ -251,7 +251,7 @@ languages:
 <dd>Learn what playbooks can do and how to write/run them.</dd>
 <dt><a class="reference external" href="http://yamllint.com/">YAMLLint</a></dt>
 <dd>YAML Lint (online) helps you debug YAML syntax if you are having problems</dd>
-<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/master/examples/playbooks">Github examples directory</a></dt>
+<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/devel/examples/playbooks">Github examples directory</a></dt>
 <dd>Complete playbook files from the github project source</dd>
 <dt><a class="reference external" href="http://groups.google.com/group/ansible-project">Mailing List</a></dt>
 <dd>Questions? Help? Ideas?  Stop by the list on Google Groups</dd>

api.html

@@ -269,7 +269,7 @@ command line tools <tt class="docutils literal"><span class="pre">ansible</span>
 in a different system.  Frequent examples include LDAP, <a class="reference external" href="http://cobbler.github.com">Cobbler</a>,
 or a piece of expensive enterprisey CMDB software.   Ansible easily supports all
 of these options via an external inventory system.</p>
-<p>If you have a data store system where an Ansible external inventory script doesn&#8217;t already exist, this may require a little coding, but we have a <a class="reference external" href="https://github.com/ansible/ansible/blob/master/examples/scripts/cobbler_external_inventory.py">Cobbler example</a> in the main source tree &#8211; but it&#8217;s pretty simple, as we&#8217;ll explain below &#8211; that would provide a good starting point.  Like with modules, it&#8217;s possible to build an external inventory script in any language, as long as it returns JSON.</p>
+<p>If you have a data store system where an Ansible external inventory script doesn&#8217;t already exist, this may require a little coding, but we have a <a class="reference external" href="https://github.com/ansible/ansible/blob/devel/examples/scripts/cobbler_external_inventory.py">Cobbler example</a> in the main source tree &#8211; but it&#8217;s pretty simple, as we&#8217;ll explain below &#8211; that would provide a good starting point.  Like with modules, it&#8217;s possible to build an external inventory script in any language, as long as it returns JSON.</p>
 <p>If you are familiar with Puppet terminology, this concept is basically the same as &#8216;external nodes&#8217;, with the slight difference that it also defines which hosts are managed.</p>
 <div class="section" id="script-conventions">
 <h3>Script Conventions<a class="headerlink" href="#script-conventions" title="Permalink to this headline">¶</a></h3>
@@ -298,7 +298,7 @@ if the script does not wish to do this, returning an empty hash/dictionary is th
 layer that allows it to represent data for multiple configuration management systems (even at the same time), and has
 been referred to as a &#8216;lightweight CMDB&#8217; by some admins.   This particular script will communicate with Cobbler
 using Cobbler&#8217;s XMLRPC API.</p>
-<p>To tie Ansible&#8217;s inventory to Cobbler (optional), copy <cite>this script &lt;https://github.com/ansible/ansible/blob/master/examples/scripts/cobbler_external_inventory.py&gt;</cite> to /etc/ansible/hosts and <cite>chmod +x</cite> the file.  cobblerd will now need
+<p>To tie Ansible&#8217;s inventory to Cobbler (optional), copy <cite>this script &lt;https://github.com/ansible/ansible/blob/devel/examples/scripts/cobbler_external_inventory.py&gt;</cite> to /etc/ansible/hosts and <cite>chmod +x</cite> the file.  cobblerd will now need
 to be running when you are using Ansible.</p>
 <p>Test the file by running <cite>./etc/ansible/hosts</cite> directly.   You should see some JSON data output, but it may not have
 anything in it just yet.</p>

bestpractices.html

@@ -282,7 +282,7 @@ This way you have an audit trail describing when and why you changed the rules a
 <dd>Learn how to extend Ansible by writing your own modules</dd>
 <dt><a class="reference internal" href="patterns.html"><em>Inventory &amp; Patterns</em></a></dt>
 <dd>Learn about how to select hosts</dd>
-<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/master/examples/playbooks">Github examples directory</a></dt>
+<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/devel/examples/playbooks">Github examples directory</a></dt>
 <dd>Complete playbook files from the github project source</dd>
 <dt><a class="reference external" href="http://groups.google.com/group/ansible-project">Mailing List</a></dt>
 <dd>Questions? Help? Ideas?  Stop by the list on Google Groups</dd>

moduledev.html

@@ -471,7 +471,7 @@ the program.   Stop by the mailing list to inquire about requirements.</p>
 <dl class="last docutils">
 <dt><a class="reference internal" href="modules.html"><em>Ansible Modules</em></a></dt>
 <dd>Learn about available modules</dd>
-<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/master/library">Github modules directory</a></dt>
+<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/devel/library">Github modules directory</a></dt>
 <dd>Browse source of core modules</dd>
 <dt><a class="reference external" href="http://groups.google.com/group/ansible-project">Mailing List</a></dt>
 <dd>Questions? Help? Ideas?  Stop by the list on Google Groups</dd>

modules.html

@@ -909,6 +909,11 @@ apt-get install python-mysqldb.</p>
 <td>&nbsp;</td>
 <td>set the user&#8217;s password</td>
 </tr>
+<tr><td>host</td>
+<td>no</td>
+<td>localhost</td>
+<td>the &#8216;host&#8217; part of the MySQL username</td>
+</tr>
 <tr><td>login_user</td>
 <td>no</td>
 <td>&nbsp;</td>

playbooks.html

@@ -203,7 +203,7 @@ tasks, playbooks are more likely to be kept in source control and used
 to push out your configuration or assure the configurations of your
 remote systems are in spec.</p>
 <p>Let&#8217;s dive in and see how they work.  As you go, you may wish to open
-the <a class="reference external" href="https://github.com/ansible/ansible/tree/master/examples/playbooks">github examples directory</a> in
+the <a class="reference external" href="https://github.com/ansible/ansible/tree/devel/examples/playbooks">github examples directory</a> in
 another tab, so you can apply the theory to what things look like in practice.</p>
 <div class="section" id="playbook-language-example">
 <h2>Playbook Language Example<a class="headerlink" href="#playbook-language-example" title="Permalink to this headline">¶</a></h2>
@@ -499,7 +499,7 @@ package is installed.  Try it!</p>
 <dd>Learn how to extend Ansible by writing your own modules</dd>
 <dt><a class="reference internal" href="patterns.html"><em>Inventory &amp; Patterns</em></a></dt>
 <dd>Learn about how to select hosts</dd>
-<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/master/examples/playbooks">Github examples directory</a></dt>
+<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/devel/examples/playbooks">Github examples directory</a></dt>
 <dd>Complete playbook files from the github project source</dd>
 <dt><a class="reference external" href="http://groups.google.com/group/ansible-project">Mailing List</a></dt>
 <dd>Questions? Help? Ideas?  Stop by the list on Google Groups</dd>

playbooks2.html

@@ -578,7 +578,7 @@ logs from ansible-pull runs would be an excellent way to gather and analyze remo
 <dd>Learn how to extend Ansible by writing your own modules</dd>
 <dt><a class="reference internal" href="patterns.html"><em>Inventory &amp; Patterns</em></a></dt>
 <dd>Learn about how to select hosts</dd>
-<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/master/examples/playbooks">Github examples directory</a></dt>
+<dt><a class="reference external" href="https://github.com/ansible/ansible/tree/devel/examples/playbooks">Github examples directory</a></dt>
 <dd>Complete playbook files from the github project source</dd>
 <dt><a class="reference external" href="http://groups.google.com/group/ansible-project">Mailing List</a></dt>
 <dd>Questions? Help? Ideas?  Stop by the list on Google Groups</dd>

rst/YAMLSyntax.rst

@@ -86,7 +86,7 @@ That's all you really need to know about YAML to get started writing
        Learn what playbooks can do and how to write/run them.
    `YAMLLint <http://yamllint.com/>`_
        YAML Lint (online) helps you debug YAML syntax if you are having problems
-   `Github examples directory <https://github.com/ansible/ansible/tree/master/examples/playbooks>`_
+   `Github examples directory <https://github.com/ansible/ansible/tree/devel/examples/playbooks>`_
        Complete playbook files from the github project source
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups

rst/api.rst

@@ -89,7 +89,7 @@ in a different system.  Frequent examples include LDAP, `Cobbler <http://cobbler
 or a piece of expensive enterprisey CMDB software.   Ansible easily supports all
 of these options via an external inventory system.
 
-If you have a data store system where an Ansible external inventory script doesn't already exist, this may require a little coding, but we have a `Cobbler example <https://github.com/ansible/ansible/blob/master/examples/scripts/cobbler_external_inventory.py>`_ in the main source tree -- but it's pretty simple, as we'll explain below -- that would provide a good starting point.  Like with modules, it's possible to build an external inventory script in any language, as long as it returns JSON.
+If you have a data store system where an Ansible external inventory script doesn't already exist, this may require a little coding, but we have a `Cobbler example <https://github.com/ansible/ansible/blob/devel/examples/scripts/cobbler_external_inventory.py>`_ in the main source tree -- but it's pretty simple, as we'll explain below -- that would provide a good starting point.  Like with modules, it's possible to build an external inventory script in any language, as long as it returns JSON.
 
 If you are familiar with Puppet terminology, this concept is basically the same as 'external nodes', with the slight difference that it also defines which hosts are managed.
 
@@ -123,7 +123,7 @@ layer that allows it to represent data for multiple configuration management sys
 been referred to as a 'lightweight CMDB' by some admins.   This particular script will communicate with Cobbler
 using Cobbler's XMLRPC API.
 
-To tie Ansible's inventory to Cobbler (optional), copy `this script <https://github.com/ansible/ansible/blob/master/examples/scripts/cobbler_external_inventory.py>` to /etc/ansible/hosts and `chmod +x` the file.  cobblerd will now need
+To tie Ansible's inventory to Cobbler (optional), copy `this script <https://github.com/ansible/ansible/blob/devel/examples/scripts/cobbler_external_inventory.py>` to /etc/ansible/hosts and `chmod +x` the file.  cobblerd will now need
 to be running when you are using Ansible.
 
 Test the file by running `./etc/ansible/hosts` directly.   You should see some JSON data output, but it may not have

rst/bestpractices.rst

@@ -118,7 +118,7 @@ Since a system can be in more than one group, if you have multiple datacenters o
        Learn how to extend Ansible by writing your own modules
    :doc:`patterns`
        Learn about how to select hosts
-   `Github examples directory <https://github.com/ansible/ansible/tree/master/examples/playbooks>`_
+   `Github examples directory <https://github.com/ansible/ansible/tree/devel/examples/playbooks>`_
        Complete playbook files from the github project source
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups

rst/moduledev.rst

@@ -330,7 +330,7 @@ the program.   Stop by the mailing list to inquire about requirements.
 
    :doc:`modules`
        Learn about available modules
-   `Github modules directory <https://github.com/ansible/ansible/tree/master/library>`_
+   `Github modules directory <https://github.com/ansible/ansible/tree/devel/library>`_
        Browse source of core modules
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups

rst/playbooks.rst

@@ -17,7 +17,7 @@ to push out your configuration or assure the configurations of your
 remote systems are in spec.
 
 Let's dive in and see how they work.  As you go, you may wish to open 
-the `github examples directory <https://github.com/ansible/ansible/tree/master/examples/playbooks>`_ in
+the `github examples directory <https://github.com/ansible/ansible/tree/devel/examples/playbooks>`_ in
 another tab, so you can apply the theory to what things look like in practice.
 
 Playbook Language Example
@@ -362,7 +362,7 @@ package is installed.  Try it!
        Learn how to extend Ansible by writing your own modules
    :doc:`patterns`
        Learn about how to select hosts
-   `Github examples directory <https://github.com/ansible/ansible/tree/master/examples/playbooks>`_
+   `Github examples directory <https://github.com/ansible/ansible/tree/devel/examples/playbooks>`_
        Complete playbook files from the github project source
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups

rst/playbooks2.rst

@@ -444,7 +444,7 @@ Ansible playbooks also look more impressive with cowsay installed, and we encour
        Learn how to extend Ansible by writing your own modules
    :doc:`patterns`
        Learn about how to select hosts
-   `Github examples directory <https://github.com/ansible/ansible/tree/master/examples/playbooks>`_
+   `Github examples directory <https://github.com/ansible/ansible/tree/devel/examples/playbooks>`_
        Complete playbook files from the github project source
    `Mailing List <http://groups.google.com/group/ansible-project>`_
        Questions? Help? Ideas?  Stop by the list on Google Groups