From b749af0b103c57c5a6f13719f6e25b7e35c1d8b8 Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Sat, 26 Jan 2013 13:07:06 -0500
Subject: [PATCH] New changelog additions from today's merging

---
 CHANGELOG.md   | 11 +++++++++++
 library/sysctl |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d97db17cdc..c11f3a610a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,17 @@ Ansible Changes By Release
 * "template override" ??
 * lots of documentation tweaks
 * handle tilde shell character for --private-key
+* get_url module can now send user/password authorization
+* new ec2_facts module
+* hg module now in core
+* ec2 module can now deploy multiple simultaneous instances
+* fix for apt_key modules stalling in some situations
+* hash merging policy is now selectable in the config file, can choose to override or merge
+* ec2 module is now powered by Boto
+* fix to enable Jinja2 {% include %} to work again
+* added pkgin module for Joyent SmartOS
+* setup module can now detect if package manager is using pacman
+
 
 * ...
 
diff --git a/library/sysctl b/library/sysctl
index 6231f240e3c..45e948d2249 100644
--- a/library/sysctl
+++ b/library/sysctl
@@ -29,7 +29,7 @@ version_added: "0.6"
 options:
     name:
         description:
-            - "this is the short path, decimal seperated, to the sysctl entry, ex: C(vm.swappiness)"
+            - this is the short path, decimal seperated, to the sysctl entry
         required: true
         default: null
         aliases: [ 'key' ]