Skip to content

Commit

Permalink
Basic docsite formatting fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael DeHaan committed Jan 2, 2014
1 parent 86719ce commit 2f811c4
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 10 deletions.
32 changes: 26 additions & 6 deletions docs/man/man1/ansible-pull.1
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
'\" t
.\" Title: ansible
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
.\" Date: 11/27/2013
.\" Author: :doctype:manpage
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
.\" Date: 01/02/2014
.\" Manual: System administration commands
.\" Source: Ansible 1.4.1
.\" Source: Ansible 1.5
.\" Language: English
.\"
.TH "ANSIBLE" "1" "11/27/2013" "Ansible 1\&.4\&.1" "System administration commands"
.TH "ANSIBLE" "1" "01/02/2014" "Ansible 1\&.5" "System administration commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Expand All @@ -25,7 +34,7 @@ ansible-pull \- set up a remote copy of ansible on each managed node
ansible \-d DEST \-U URL [options] [ <filename\&.yml> ]
.SH "DESCRIPTION"
.sp
\fBAnsible\fR is an extra\-simple tool/framework/API for doing \'remote things\' over SSH\&.
\fBAnsible\fR is an extra\-simple tool/framework/API for doing \*(Aqremote things\*(Aq over SSH\&.
.sp
Use ansible\-pull to set up a remote copy of ansible on each managed node, each set to run via cron and update playbook source via a source repository\&. This inverts the default \fBpush\fR architecture of ansible into a \fBpull\fR architecture, which has near\-limitless scaling potential\&.
.sp
Expand Down Expand Up @@ -77,6 +86,11 @@ Purge the checkout after the playbook is run\&.
.RS 4
Module used to checkout playbook repository\&. Defaults to git\&.
.RE
.PP
\fB\-o\fR, \fB\-\-only\-if\-changed\fR
.RS 4
Run the playbook only if the repository has changed
.RE
.SH "AUTHOR"
.sp
Ansible was originally written by Michael DeHaan\&. See the AUTHORS file for a complete list of contributors\&.
Expand All @@ -90,3 +104,9 @@ Ansible is released under the terms of the GPLv3 License\&.
\fBansible\fR(1), \fBansible\-playbook\fR(1), \fBansible\-doc\fR(1)
.sp
Extensive documentation as well as IRC and mailing list info is available on the ansible home page: https://ansible\&.github\&.com/
.SH "AUTHOR"
.PP
\fB:doctype:manpage\fR
.RS 4
Author.
.RE
2 changes: 1 addition & 1 deletion docsite/rst/playbooks_variables.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Variables defined from included files and roles

It turns out we've already talked about variables in another place too.

As described in :doc:`intro_roles`, variables can also be included in the playbook via include files, which may or may
As described in :doc:`playbooks_roles`, variables can also be included in the playbook via include files, which may or may
not be part of an "Ansible Role". Usage of roles is preferred as it provides a nice organizational system.

.. _about_jinja2:
Expand Down
2 changes: 1 addition & 1 deletion hacking/templates/rst.j2
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Examples

::

@{ plainexamples | escape | indent(4, True) }@
@{ plainexamples | indent(4, True) }@
{% endif %}
{% endif %}

Expand Down
4 changes: 2 additions & 2 deletions library/files/template
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ options:
- all arguments accepted by the M(file) module also work here
required: false
notes:
- Since Ansible version 0.9, templates are loaded with C(trim_blocks=True).
- "Since Ansible version 0.9, templates are loaded with C(trim_blocks=True)."

- "Also, you can override jinja2 settings by adding a special header to template file.
i.e. C(#jinja2:variable_start_string:'[%' , variable_end_string:'%]')
which changes the variable interpolation markers to [% var %] instead of {{ var }}." This is the best way to prevent evaluation of things that look like, but should not be Jinja2. raw/endraw in Jinja2 will not work as you expect because templates in Ansible are recursively evaluated.
which changes the variable interpolation markers to [% var %] instead of {{ var }}. This is the best way to prevent evaluation of things that look like, but should not be Jinja2. raw/endraw in Jinja2 will not work as you expect because templates in Ansible are recursively evaluated."

requirements: []
author: Michael DeHaan
Expand Down

0 comments on commit 2f811c4

Please sign in to comment.