diff --git a/docsite/rst/glossary.rst b/docsite/rst/glossary.rst
index 51a2bc1e6c..30c42eb10b 100644
--- a/docsite/rst/glossary.rst
+++ b/docsite/rst/glossary.rst
@@ -401,8 +401,8 @@ Transport
 
 Ansible uses "Connection Plugins" to define types of available transports.  These are simply how ansible will reach out to managed systems.  Transports included are paramiko (the default SSH transport), SSH (using openssh), fireball (an SSH bootstrapped accelerated connection plugin), and local. 
 
-When_*
-++++++
+When
+++++
 
 When statements (when_string, when_changed, when_boolean, when_integer, etc) are easier to write forms of the only_if conditional. They can be affixed to any task to make that task decide to run only when an expression involving variables or facts is actually true.
 
diff --git a/library/uri b/library/uri
index bb44c4a397..7e5d0b6e31 100644
--- a/library/uri
+++ b/library/uri
@@ -105,40 +105,13 @@ options:
     required: false
     default: 200
   HEADER_:
-    description: >
-        Any parameter starting with "HEADER_" is a sent with your request as a header. For example,
-        HEADER_Content-Type="application/json" would send the header "Content-Type" along with your
-        request with a value of "application/json".
+    description: Any parameter starting with "HEADER_" is a sent with your request as a header. For example, HEADER_Content-Type="application/json" would send the header "Content-Type" along with your request with a value of "application/json".
     required: false
     default: null
   others:
     description:
       - all arguments accepted by the M(file) module also work here
     required: false
-examples:
-   - code: "uri: url=http://www.awesome.com method=GET"
-     description: "Check that you can connect to a page and it returns a status 200"
-
-   - code: | 
-           action: uri url=http://www.awesome.com method=GET return_content=yes
-           register: webpage
-
-           action: fail
-           when_string: '"AWESOME" not in "${webpage.content}"'
-
-     description: Check that a page returns a status 200 and the word AWESOME is in the page contents.
-
-   - code: |
-           action: uri url=https://your.jira.server.com/rest/api/2/issue/ method=POST user=your_username password=your_pass body='$FILE(issue.json)' force_basic_auth=yes status_code=201 HEADER_Content-Type="application/json"  
-     description: "Create a JIRA issue." 
-
-   - code: |
-           action: uri url=https://your.form.based.auth.app.com/index.php method=POST body="name=your_username&password=your_password&enter=Sign%20in" status_code=302 HEADER_Content-Type="application/x-www-form-urlencoded"
-           register: login
-
-           action: uri url=https://your.form.based.auth.app.com/dashboard.php method=GET return_content=yes HEADER_Cookie="${login.set_cookie}"
-     description: "Login to a form based webpage, then use the cookie that got returned to access the app in later tasks."
-
 # informational: requirements for nodes
 requirements: [ urlparse, httplib2 ]
 author: Romeo Theriault