Add comments and alternatives to arm-5
Merge pull request #12 from hlindberg/arm-5

Add comments and alternatives to arm-5
Merge branch 'master' of ssh://git@github.com/puppetlabs/armatures.git
Reworks meta ARM

Added a workflow  diagram image; Synced metadata examples

Signed-off-by: J.D. Welch <me@jdwelch.net>
Reworks meta ARM

Added a workflow  diagram image; Synced metadata examples

Signed-off-by: J.D. Welch <me@jdwelch.net>
Merge branch 'master' of https://github.com/jdwelch/armatures

Signed-off-by: J.D. Welch <me@jdwelch.net>

Conflicts:
	arm-0.arm/arm.md
Update recommendation.

This modifies the recommended "picking" (after having tried writing in
the first recommended style, I found it to be tedious).

Also fixes formatting/numbering of the paragraphs.
Update arm-2.iteration examples

Includes examples picked from the puppet mailing lists and expresses
them in the recommended style.
Merge branch 'master' of ssh://git@github.com/puppetlabs/armatures.git
s/pep/armatures/

Signed-off-by: J.D. Welch <me@jdwelch.net>
rename diagram image; add source file for diagram

Signed-off-by: J.D. Welch <me@jdwelch.net>
updates to arm-0 workflow
Merge pull request #13 from jdwelch/master

arm-0 : First crack at a formalized curation process
placeholders for arm-8 and arm-9
Merge pull request #16 from jdwelch/master

placeholder for arm-8 and arm-9
Merge branch 'master' of ssh://git@github.com/puppetlabs/armatures.git