Merge pull request #438 from stormpath/develop

Grab bag of updates and error fixes

source/accnt_mgmt.rst

@@ -1237,7 +1237,7 @@ If your passwords are hashed with MD5 or SHA, you can import them by creating a
 
   * - ``BASE64_SALT``
     - The salt byte array used to salt the first hash iteration.
-    - String (Base64). If your password hashes do not have salt, you can omit it entirely.
+    - String (Base64). If your password hashes were not salted, this must be the empty string (such that the two dollar-sign delimiters appear right next to each other in the MCF String).
 
   * - ``BASE64_PASSWORD_HASH``
     - The computed hash byte array.
@@ -1925,10 +1925,6 @@ This query will match Accounts with a ``startDate`` value between ``2012-01-01``
 
   For a full description please see :ref:`the Reference chapter <search-customdata>`.
 
-.. note::
-
-  This feature is currently in beta. If you have any questions, comments, or suggestions, reach out to us at [email protected].
-
 .. _managing-account-pwd:
 
 3.4. How to Manage an Account's Password

source/auth_n.rst

@@ -2712,7 +2712,7 @@ Step 5: Configure Your Application
 
 Your Stormpath Application Resource has two parts that are relevant to SAML:
 
-1. An ``authorizedCallbackUri`` Array that defines the authorized URIs that the IdP can return your user to. These should be URIs that you host yourself.
+1. An ``authorizedCallbackUri`` Array that defines the authorized URIs that the IdP can return your user to with the authentication result. These should be URIs that you host yourself.
 
 You should create any URIs here that you would like included as authorized callback URIs, to a maximum of 4000 characters in total length.
 
@@ -3484,7 +3484,7 @@ The `claims <https://tools.ietf.org/html/rfc7519#section-4.1>`_ for the JWT body
 
   * - ``cb_uri``
     - No
-    - The callback URI to use once the user takes an action on the ID Site or Identity provider. This must match a Authorized Callback URI on Application resource, otherwise the flow will default to the first Callback URI that does not contain a wildcard.
+    - The callback URI to use once the user takes an action on the ID Site or Identity provider. This URI will be passed a secure JWT as a URL parameter, and it's job will be to validate that JWT and return the Stormpath Account. This URI must match a Authorized Callback URI on an Application resource, otherwise the flow will default to the first Callback URI that does not contain a wildcard.
 
   * - ``jti``
     - Yes

source/code/java/authentication/refresh_access_token_req.java

@@ -1,4 +1,4 @@
-OAuthPasswordGrantRequestAuthentication request =
+OAuthRefreshTokenRequestAuthentication request =
     OAuthRequests.OAUTH_REFRESH_TOKEN_REQUEST
         .builder()
         .setRefreshToken(refreshTokenString)

source/reference.rst

@@ -741,10 +741,6 @@
   Custom Data Search
   """"""""""""""""""
 
-  .. note::
-
-    This feature is currently in beta, any questions comments or suggestions, reach out to us at [email protected]
-
   It is also possible to search a collection's Custom Data. This means that you send a query to a collection:
 
   ``?customData.{key}={value}``