From 06dde0d332d88e958ac5489bea88f0f5bc536e1b Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansible.com>
Date: Thu, 10 Dec 2015 10:57:48 -0500
Subject: [PATCH] Fixed documentation typos and bits that needed clarification.
 Fixed missing spaces in VALID_ACTIONS.

---
 docs/man/man1/ansible-galaxy.1.asciidoc.in | 19 ++++++++++---------
 docsite/rst/galaxy.rst                     |  4 ++--
 docsite/rst/intro_configuration.rst        |  4 ++--
 lib/ansible/cli/galaxy.py                  |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docs/man/man1/ansible-galaxy.1.asciidoc.in b/docs/man/man1/ansible-galaxy.1.asciidoc.in
index 44f0b46b08..9ffe65e45a 100644
--- a/docs/man/man1/ansible-galaxy.1.asciidoc.in
+++ b/docs/man/man1/ansible-galaxy.1.asciidoc.in
@@ -147,8 +147,9 @@ configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
 SEARCH
 ------
 
-The *search* sub-command returns a filtered list of roles found at
-galaxy.ansible.com.
+The *search* sub-command returns a filtered list of roles found on the remote
+server.
+
 
 USAGE
 ~~~~~
@@ -170,7 +171,7 @@ Provide a comma separated list of Platforms on which to filter.
 
 Specify the username of a Galaxy contributor on which to filter.
 
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
@@ -199,7 +200,7 @@ OPTIONS
 The path to the directory containing your roles. The default is the *roles_path* 
 configured in your *ansible.cfg* file (/etc/ansible/roles if not configured)
 
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
@@ -213,7 +214,7 @@ LOGIN
 
 The *login* sub-command is used to authenticate with galaxy.ansible.com. 
 Authentication is required to use the import, delete and setup commands.
-It will authenticate the user,retrieve a token from Galaxy, and store it
+It will authenticate the user, retrieve a token from Galaxy, and store it
 in the user's home directory.
 
 USAGE
@@ -236,7 +237,7 @@ click on Personal Access Token to create a token.
 OPTIONS
 ~~~~~~~
 
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
@@ -262,7 +263,7 @@ $ ansible-galaxy import [options] github_user github_repo
 
 OPTIONS
 ~~~~~~~
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
@@ -291,7 +292,7 @@ $ ansible-galaxy delete [options] github_user github_repo
 OPTIONS
 ~~~~~~~
 
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
@@ -323,7 +324,7 @@ $ ansible-galaxy setup [options] source github_user github_repo secret
 OPTIONS
 ~~~~~~~
 
-*-c*, *--ingore-certs*::
+*-c*, *--ignore-certs*::
 
 Ignore TLS certificate errors. 
 
diff --git a/docsite/rst/galaxy.rst b/docsite/rst/galaxy.rst
index 200fdfd575..f8cde57e62 100644
--- a/docsite/rst/galaxy.rst
+++ b/docsite/rst/galaxy.rst
@@ -364,8 +364,8 @@ When you create your .travis.yml file add the following to cause Travis to notif
     section of your ansible.cfg file.
 
 
-List Travis Integrtions
-=======================
+List Travis Integrations
+========================
 
 Use the --list option to display your Travis integrations:
 
diff --git a/docsite/rst/intro_configuration.rst b/docsite/rst/intro_configuration.rst
index 0ad54938d0..ccfb456ed9 100644
--- a/docsite/rst/intro_configuration.rst
+++ b/docsite/rst/intro_configuration.rst
@@ -906,10 +906,10 @@ The following options can be set in the [galaxy] section of ansible.cfg:
 server
 ======
 
-Override the default Galaxy server value of https://galaxy.ansible.com.
+Override the default Galaxy server value of https://galaxy.ansible.com. Useful if you have a hosted version of the Galaxy web app or want to point to the testing site https://galaxy-qa.ansible.com. It does not work against private, hosted repos, which Galaxy can use for fetching and installing roles.
 
 ignore_certs
 ============
 
 If set to *yes*, ansible-galaxy will not validate TLS certificates. Handy for testing against a server with a self-signed certificate
-.
\ No newline at end of file
+.
diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index a4a7b915f3..34afa03c9f 100644
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -49,7 +49,7 @@ except ImportError:
 class GalaxyCLI(CLI):
 
     SKIP_INFO_KEYS = ("name", "description", "readme_html", "related", "summary_fields", "average_aw_composite", "average_aw_score", "url" )
-    VALID_ACTIONS = ("delete","import","info","init","install","list","login","remove","search","setup")
+    VALID_ACTIONS = ("delete", "import", "info", "init", "install", "list", "login", "remove", "search", "setup")
     
     def __init__(self, args):
         self.api = None