Merge branch 'master' of /git/ansible

This commit is contained in:
Stephen Smoogen 2016-05-07 15:29:22 +00:00
commit e7f0781d9a

View file

@ -66,7 +66,7 @@
<div class="grid_1"> <!-- search filler --></div> <div class="grid_1"> <!-- search filler --></div>
<div class="grid_6" id="site-heading-rh"> <div class="grid_6" id="site-heading-rh">
<a href="https://redhat.com">A Red Hat-Sponsored Community Project <a href="https://redhat.com">A Red Hat-Sponsored Community Project
<img id="rh-community" src="https://fedoraproject.org/static/images/sponsors/redhat-community.png" <img id="rh-community" src="https://getfedora.org/static/images/sponsors/redhat-community.png"
alt="Red Hat Logo" /></a> alt="Red Hat Logo" /></a>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
@ -186,7 +186,7 @@
<dl> <dl>
<dt>Fedora</dt> <dt>Fedora</dt>
<dd><a href="https://fedoraproject.org/en/about-fedora">About Fedora</a></dd> <dd><a href="https://fedoraproject.org/en/about-fedora">About Fedora</a></dd>
<dd><a href="http://fedoraplanet.org/">Planet Fedora</a></dd> <dd><a href="http://planet.fedoraproject.org/">Planet Fedora</a></dd>
<dd><a href="https://fedoraproject.org/wiki/FWN/LatestIssue">Fedora Weekly News</a></dd> <dd><a href="https://fedoraproject.org/wiki/FWN/LatestIssue">Fedora Weekly News</a></dd>
<dd><a href="https://docs.fedoraproject.org/">Documentation</a></dd> <dd><a href="https://docs.fedoraproject.org/">Documentation</a></dd>
@ -252,7 +252,7 @@
<div id="footer" class="grid_12"> <div id="footer" class="grid_12">
<a href="https://www.redhat.com/"><img class="rh-logo" <a href="https://www.redhat.com/"><img class="rh-logo"
src="https://fedoraproject.org/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a> src="https://getfedora.org/static/images/sponsors/sidebar/redhat.png" alt="Red Hat Logo" /></a>
<p class="sponsor">Fedora is sponsored by Red Hat.</p> <p class="sponsor">Fedora is sponsored by Red Hat.</p>
<p class="sponsor"><a href="https://www.redhat.com/rhel/fedora/">Learn more about the relationship between Red Hat and Fedora &gt;</a></p> <p class="sponsor"><a href="https://www.redhat.com/rhel/fedora/">Learn more about the relationship between Red Hat and Fedora &gt;</a></p>
<p class="copy">(C) 2011 Red Hat, Inc. and others.</p> <p class="copy">(C) 2011 Red Hat, Inc. and others.</p>