Resolving differences in core modules post-merge

lib/ansible/modules/packaging/os/rhn_register.py

@@ -71,13 +71,13 @@ options:
             - supply a custom ssl CA certificate file for use with registration
         required: False
         default: None
-        version_added: "2.0"
+        version_added: "2.1"
     systemorgid:
         description:
             - supply an organizational id for use with registration
         required: False
         default: None
-        version_added: "2.0"
+        version_added: "2.1"
     channels:
         description:
             - Optionally specify a list of comma-separated channels to subscribe to upon successful registration.

lib/ansible/modules/packaging/os/rpm_key.py

@@ -154,7 +154,7 @@ class RpmKey:
             gpg = self.module.get_bin_path('gpg2')
 
         if not gpg:
-            self.json_fail(msg="rpm_key requires a command lne gpg or gpg2, none found")
+            self.json_fail(msg="rpm_key requires a command line gpg or gpg2, none found")
 
         stdout, stderr = self.execute_command([gpg, '--no-tty', '--batch', '--with-colons', '--fixed-list-mode', '--list-packets', keyfile])
         for line in stdout.splitlines():

lib/ansible/modules/packaging/os/yum.py

@@ -56,7 +56,7 @@ options:
     aliases: [ 'pkg' ]
   exclude:
     description:
-      - "Package name(s) to exlude when state=present, or latest
+      - "Package name(s) to exclude when state=present, or latest"
     required: false
     version_added: "2.0"
     default: null