From: Jeff McCune <jeff@puppetlabs.com>
Date: Fri, 30 Dec 2011 18:46:57 +0000 (-0800)
Subject: Merge branch 'v2.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7aeeae3721f105d99a5cdd2e8110315791fd40bd;p=puppet-stdlib.git

Merge branch 'v2.x'

* v2.x:
  Docs: Clarify the use case for the anchor type
  Docs: Remove author emails from stdlib functions
  Docs: Copyedit function doc strings
  Docs: Correct indentation of markdown code examples
  Docs: Update documentation of stdlib classes
  Docs: Update file_line documentation
  Docs: Improve example in merge function
---

7aeeae3721f105d99a5cdd2e8110315791fd40bd