Consistent typesetting of "GitHub" (#50929)

lib/ansible/cli/galaxy.py

@@ -536,7 +536,7 @@ class GalaxyCLI(CLI):
 
     def execute_login(self):
         """
-        verify user's identify via Github and retrieve an auth token from Ansible Galaxy.
+        verify user's identify via GitHub and retrieve an auth token from Ansible Galaxy.
         """
         # Authenticate with github and retrieve a token
         if context.CLIARGS['token'] is None:
@@ -588,7 +588,7 @@ class GalaxyCLI(CLI):
 
             if len(task) > 1:
                 # found multiple roles associated with github_user/github_repo
-                display.display("WARNING: More than one Galaxy role associated with Github repo %s/%s." % (github_user, github_repo),
+                display.display("WARNING: More than one Galaxy role associated with GitHub repo %s/%s." % (github_user, github_repo),
                                 color='yellow')
                 display.display("The following Galaxy roles are being updated:" + u'\n', color=C.COLOR_CHANGED)
                 for t in task:
@@ -620,7 +620,7 @@ class GalaxyCLI(CLI):
         return 0
 
     def execute_setup(self):
-        """ Setup an integration from Github or Travis for Ansible Galaxy roles"""
+        """ Setup an integration from GitHub or Travis for Ansible Galaxy roles"""
 
         if context.CLIARGS['setup_list']:
             # List existing integration secrets

lib/ansible/galaxy/login.py

@@ -50,7 +50,7 @@ class GalaxyLogin(object):
             self.get_credentials()
 
     def get_credentials(self):
-        display.display(u'\n\n' + "We need your " + stringc("Github login", 'bright cyan') +
+        display.display(u'\n\n' + "We need your " + stringc("GitHub login", 'bright cyan') +
                         " to identify you.", screen_only=True)
         display.display("This information will " + stringc("not be sent to Galaxy", 'bright cyan') +
                         ", only to " + stringc("api.github.com.", "yellow"), screen_only=True)
@@ -59,7 +59,7 @@ class GalaxyLogin(object):
                         " if you do not want to enter your password." + u'\n\n', screen_only=True)
 
         try:
-            self.github_username = input("Github Username: ")
+            self.github_username = input("GitHub Username: ")
         except Exception:
             pass
 
@@ -69,7 +69,7 @@ class GalaxyLogin(object):
             pass
 
         if not self.github_username or not self.github_password:
-            raise AnsibleError("Invalid Github credentials. Username and password are required.")
+            raise AnsibleError("Invalid GitHub credentials. Username and password are required.")
 
     def remove_github_token(self):
         '''

lib/ansible/modules/source_control/_github_hooks.py

@@ -27,7 +27,7 @@ version_added: "1.4"
 options:
   user:
     description:
-      - Github username.
+      - GitHub username.
     required: true
   oauthkey:
     description:

lib/ansible/modules/source_control/github_webhook.py

@@ -237,7 +237,7 @@ def main():
             module.params["github_url"], to_native(err)))
     except github.UnknownObjectException as err:
         module.fail_json(
-            msg="Could not find repository %s in Github at %s: %s" % (
+            msg="Could not find repository %s in GitHub at %s: %s" % (
                 module.params["repository"], module.params["github_url"],
                 to_native(err)))
     except Exception as err:

lib/ansible/modules/source_control/github_webhook_facts.py

@@ -144,7 +144,7 @@ def main():
             module.params["github_url"], to_native(err)))
     except github.UnknownObjectException as err:
         module.fail_json(
-            msg="Could not find repository %s in Github at %s: %s" % (
+            msg="Could not find repository %s in GitHub at %s: %s" % (
                 module.params["repository"], module.params["github_url"],
                 to_native(err)))
     except Exception as err: