Merge pull request #35 from ahpook/master

Issue ARM-13 to djmitche for SSL Behaviour
Correct date in ARM-13 table row
s/manifest/metadata/
Merge pull request #36 from djmitche/typo

s/manifest/metadata/
Reserve ARM-14

For reboot.
Manage system reboots

This describes a proposal for managing system reboots.
(arm-4) Update arm-4. New template format, new content. Now implemented.

This updates the heredoc arm.4. It is rewritten using the new arm
template format. New features have been introduced and some restrictions
from the previous version of the document has been removed.

There is now also a reference to the full implementation of the
proposal.
Merge branch 'master' of ssh://git@github.com/puppetlabs/armatures.git

Conflicts:
	arm-4.heredoc/metadata.json
(ARM-4) Update ARM 4 Heredoc to 2.0.0

This concludes a series of edits fixing details in the text to make it
use the new template and describe how the reference implementation
works.
Merge pull request #37 from hlindberg/master

ARM-4 Heredoc Update to Version 2 - ready for submission
Updating Capabilities Armature

The main document was previously a long description of something
more like philosophy, and now it's a more clear description
of what I think we should do and why, with examples.

I've also removed my old description, as it was too free-form
and had some contradictory information in it.

Note that the Armature templates do not actually talk about content
itself.  They talk about some basics, but you can't take the templates
and usefully build an armature from them.

Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Merge pull request #38 from lak/modified_capabilities

Capabilities Armature Update 3
(ARM 3) Update ARM 3 Puppet Templates to 1.0.0

This concludes a series of edits fixing details in the text to make
it use the new arm template and describe how the reference
implementation works. 

Earlier resolved discussions embedded in the text are removed.
Merge pull request #30 from joshcooper/reboot

Manage system reboots
Merge pull request #39 from hlindberg/master

Update ARM-3 Puppet Templates to 1.0.0 - Ready to be Submitted
.epp should always be the preferred extension by convention

This is the recommended behavior with ERB. There are a handful of reasons for this, most of which being good editor support. Presumably support for the EPP syntax will need to be added to most common editors, and the `.epp` extension (or in this example `.html.epp`) is the easiest way to identify the syntax to use (rather than relying on magic comments or manual intervention).
Merge pull request #40 from wfarr/patch-1

ARM-3 .epp should always be the preferred extension by convention
Add specific instructions about what to do with templates

Previously it was unclear exactly what to do with these templates, so
this commit adds step-by-step instructions.

Closes #29