Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 2.0.x to master #515

Merged
merged 10 commits into from
Apr 29, 2015
Merged

Conversation

underscorgan
Copy link

No description provided.

Morgan Haskel and others added 10 commits April 27, 2015 10:21
1. Make sure that for each parameter, where applicable, there is a default value.
2. Make sure that for each parameter that's applicable, there is a note if the parameter is optional.
3. Make sure the links in the README work and are accurate.
4. Update the link in the Contributing section to point here: https://docs.puppetlabs.com/forge/contributing.html
5. General copyediting.

* Add a ToC
* Reorganize Usage & Reference sections
* Standardize capitalization of "Apt" (as opposed to "apt", the module)
* Standardize Development section

Apply edits from @jbondpdx

* Re-emphasize the warning about short key names
* Restore the “What apt affects” section
* Re-correct capitalization of “Apt” (where it had reverted to “APT”)
* Clarify OS compatibility in Limitations and elsewhere
* Various edits for clarity
Restore Puppet 3.4 and earlier compatibility
Correct some README punctuation
@daenney
Copy link

daenney commented Apr 29, 2015

Is this good to go?

@underscorgan
Copy link
Author

@daenney yeah, was just waiting on travis-ci yesterday :)

hunner added a commit that referenced this pull request Apr 29, 2015
@hunner hunner merged commit 55a17ac into puppetlabs:master Apr 29, 2015
@underscorgan underscorgan deleted the merge_2.0.x_to_master branch April 29, 2015 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants