Merge pull request #224 from wzzrd/master

Small fix in documentation for seliux module
This commit is contained in:
Michael DeHaan 2012-09-11 19:25:59 -07:00
commit 1f4cb79787
2 changed files with 7 additions and 7 deletions

View file

@ -1732,7 +1732,7 @@ will let you know when it is required.</p>
<tr class="row-even"><td>policy</td> <tr class="row-even"><td>policy</td>
<td>yes</td> <td>yes</td>
<td>&nbsp;</td> <td>&nbsp;</td>
<td>name of the SELinux policy to use (example: &#8216;targetted&#8217;)</td> <td>name of the SELinux policy to use (example: &#8216;targeted&#8217;)</td>
</tr> </tr>
<tr class="row-odd"><td>state</td> <tr class="row-odd"><td>state</td>
<td>yes</td> <td>yes</td>
@ -1747,8 +1747,8 @@ will let you know when it is required.</p>
</tbody> </tbody>
</table> </table>
<p>Example from Ansible <a class="reference internal" href="playbooks.html"><em>Playbooks</em></a>:</p> <p>Example from Ansible <a class="reference internal" href="playbooks.html"><em>Playbooks</em></a>:</p>
<div class="highlight-python"><pre>selinux policy=targetted state=enforcing <div class="highlight-python"><pre>selinux policy=targeted state=enforcing
selinux policy=targetted state=disabled</pre> selinux policy=targeted state=disabled</pre>
</div> </div>
</div> </div>
<div class="section" id="setup"> <div class="section" id="setup">
@ -2368,4 +2368,4 @@ yum name=httpd state=installed</pre>
</div> </div>
</footer> </footer>
</body> </body>
</html> </html>

View file

@ -11,7 +11,7 @@ will let you know when it is required.
+--------------------+----------+---------------------+----------------------------------------------------------------------------+ +--------------------+----------+---------------------+----------------------------------------------------------------------------+
| parameter | required | default | comments | | parameter | required | default | comments |
+====================+==========+=====================+============================================================================+ +====================+==========+=====================+============================================================================+
| policy | yes | | name of the SELinux policy to use (example: 'targetted') | | policy | yes | | name of the SELinux policy to use (example: 'targeted') |
+--------------------+----------+---------------------+----------------------------------------------------------------------------+ +--------------------+----------+---------------------+----------------------------------------------------------------------------+
| state | yes | | the SELinux mode. 'enforcing', 'permissive', or 'disabled' | | state | yes | | the SELinux mode. 'enforcing', 'permissive', or 'disabled' |
+--------------------+----------+---------------------+----------------------------------------------------------------------------+ +--------------------+----------+---------------------+----------------------------------------------------------------------------+
@ -20,6 +20,6 @@ will let you know when it is required.
Example from Ansible :doc:`playbooks`:: Example from Ansible :doc:`playbooks`::
selinux policy=targetted state=enforcing selinux policy=targeted state=enforcing
selinux policy=targetted state=disabled selinux policy=targeted state=disabled